@mrnafisia/type-query 1.0.5 → 1.0.8

package/dist/testPool.d.ts

@@ -0,0 +1,11 @@
+import { Pool } from './types/pool';
+import { Result } from 'never-catch';
+declare type UserID = number;
+declare const setTestDBInfo: (connectionUrl: string, name?: string) => void;
+declare const getTestPool: () => Promise<Result<{
+    id: UserID;
+    pool: Pool;
+}, any>>;
+declare const releaseTestPool: (id: number, rollback?: boolean) => Promise<void>;
+export { setTestDBInfo, getTestPool, releaseTestPool };
+//# sourceMappingURL=testPool.d.ts.map

package/dist/testPool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"testPool.d.ts","sourceRoot":"","sources":["../src/testPool.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAGlC,OAAO,EAAU,MAAM,EAAC,MAAM,aAAa,CAAC;AAE5C,aAAK,MAAM,GAAG,MAAM,CAAC;AAUrB,QAAA,MAAM,aAAa,kBAAmB,MAAM,SAAS,MAAM,SAU1D,CAAC;AAEF,QAAA,MAAM,WAAW,QAAa,QAAQ,OAAO;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,CAAA;CAAE,EAAE,GAAG,CAAC,CAqB5E,CAAC;AAEF,QAAA,MAAM,eAAe,OAAc,MAAM,aAAY,OAAO,kBAsC3D,CAAC;AAsDF,OAAO,EACH,aAAa,EACb,WAAW,EACX,eAAe,EAClB,CAAC"}

package/dist/testPool.js

@@ -0,0 +1,249 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.releaseTestPool = exports.getTestPool = exports.setTestDBInfo = void 0;
+var pg_1 = require("pg");
+var error_1 = __importDefault(require("./error"));
+var pool_1 = require("./pool");
+var never_catch_1 = require("never-catch");
+var testDBInfo;
+var db = { state: 'uninitialized' };
+var usersIndex = 0;
+var keepDb = false;
+var setTestDBInfo = function (connectionUrl, name) {
+    testDBInfo = { connectionUrl: connectionUrl, name: name };
+    keepDb = evalKeepDb();
+    (0, pool_1.addHook)({
+        event: 'on-send-query',
+        hook: function (query, params) {
+            console.log('\x1b[36m' + "Query: ".concat(query));
+            console.log("Parameters: ".concat(JSON.stringify(params)) + '\x1b[0m' + '\n');
+        }
+    });
+};
+exports.setTestDBInfo = setTestDBInfo;
+var getTestPool = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var constructResult;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (testDBInfo === undefined) {
+                    throw 'test db info did not set!';
+                }
+                if (!(db.state === 'uninitialized')) return [3 /*break*/, 2];
+                db = { state: 'constructing' };
+                return [4 /*yield*/, constructTestPool()];
+            case 1:
+                constructResult = _a.sent();
+                if (!constructResult.ok) {
+                    return [2 /*return*/, constructResult];
+                }
+                db = __assign(__assign({}, constructResult.value), { state: 'ready', userIDs: [] });
+                _a.label = 2;
+            case 2:
+                if (db.state === 'ready') {
+                    db.userIDs.push(++usersIndex);
+                    return [2 /*return*/, (0, never_catch_1.ok)({ id: usersIndex, pool: db.pool })];
+                }
+                return [2 /*return*/, new Promise(function (resolve) {
+                        setTimeout(function () {
+                            resolve(getTestPool());
+                        }, 3000);
+                    })];
+        }
+    });
+}); };
+exports.getTestPool = getTestPool;
+var releaseTestPool = function (id, rollback) {
+    if (rollback === void 0) { rollback = true; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (testDBInfo === undefined) {
+                        throw 'test db info did not set!';
+                    }
+                    if (db.state !== 'ready') {
+                        throw 'db is not ready!';
+                    }
+                    if (!rollback) {
+                        keepDb = true;
+                    }
+                    db.userIDs.splice(db.userIDs.indexOf(id), 1);
+                    if (db.userIDs.length !== 0) {
+                        return [2 /*return*/];
+                    }
+                    return [4 /*yield*/, (new Promise(function (resolve, reject) {
+                            if (!(db.state === 'ready' && db.userIDs.length === 0)) {
+                                resolve(undefined);
+                                return;
+                            }
+                            setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
+                                var dbName, pool, destructingSucceed;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            if (!(db.state === 'ready' && db.userIDs.length === 0)) return [3 /*break*/, 4];
+                                            dbName = db.dbName;
+                                            pool = db.pool;
+                                            db = { state: 'destructing' };
+                                            return [4 /*yield*/, pool.$.end()];
+                                        case 1:
+                                            _a.sent();
+                                            if (!!keepDb) return [3 /*break*/, 3];
+                                            return [4 /*yield*/, dropDb(dbName)];
+                                        case 2:
+                                            destructingSucceed = _a.sent();
+                                            if (!destructingSucceed.ok) {
+                                                reject(destructingSucceed.error);
+                                                return [2 /*return*/];
+                                            }
+                                            _a.label = 3;
+                                        case 3:
+                                            db = { state: 'uninitialized' };
+                                            keepDb = evalKeepDb();
+                                            _a.label = 4;
+                                        case 4:
+                                            resolve(undefined);
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); }, 5000);
+                        }))];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+};
+exports.releaseTestPool = releaseTestPool;
+var constructTestPool = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var dbName, tempClient, createDbResult, pool;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (!(testDBInfo.name === undefined)) return [3 /*break*/, 4];
+                tempClient = new pg_1.Client({
+                    connectionString: testDBInfo.connectionUrl
+                });
+                return [4 /*yield*/, tempClient.connect()];
+            case 1:
+                _a.sent();
+                return [4 /*yield*/, createRandomNameDb(tempClient)];
+            case 2:
+                createDbResult = _a.sent();
+                return [4 /*yield*/, tempClient.end()];
+            case 3:
+                _a.sent();
+                if (!createDbResult.ok) {
+                    return [2 /*return*/, createDbResult];
+                }
+                dbName = createDbResult.value;
+                return [3 /*break*/, 5];
+            case 4:
+                dbName = testDBInfo.name;
+                _a.label = 5;
+            case 5:
+                pool = (0, pool_1.createPool)(testDBInfo.connectionUrl + '/' + dbName);
+                return [2 /*return*/, (0, never_catch_1.ok)({ pool: pool, dbName: dbName })];
+        }
+    });
+}); };
+var createRandomNameDb = function (client) { return __awaiter(void 0, void 0, void 0, function () {
+    var dbName, result;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                dbName = 'test_db_' + new Date().toISOString().replace('T', '_').replaceAll(':', '-').substring(0, 19);
+                return [4 /*yield*/, client.query("CREATE DATABASE ".concat(dbName, ";"))
+                        .then(function () { return (0, never_catch_1.ok)(dbName); })
+                        .catch(function (error) { return (0, never_catch_1.err)(error); })];
+            case 1:
+                result = _a.sent();
+                if (!result.ok) {
+                    switch (result.error.code) {
+                        case error_1.default.DATABASE_ALREADY_EXISTS:
+                            return [2 /*return*/, createRandomNameDb(client)];
+                        default:
+                            return [2 /*return*/, result];
+                    }
+                }
+                return [2 /*return*/, result];
+        }
+    });
+}); };
+var dropDb = function (dbName) { return __awaiter(void 0, void 0, void 0, function () {
+    var tempClient, result;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                tempClient = new pg_1.Client({
+                    connectionString: testDBInfo.connectionUrl
+                });
+                return [4 /*yield*/, tempClient.connect()];
+            case 1:
+                _a.sent();
+                return [4 /*yield*/, tempClient.query("DROP DATABASE ".concat(dbName, ";")).then(function () { return (0, never_catch_1.ok)(undefined); }).catch(function (error) { return (0, never_catch_1.err)(error); })];
+            case 2:
+                result = _a.sent();
+                return [4 /*yield*/, tempClient.end()];
+            case 3:
+                _a.sent();
+                return [2 /*return*/, result];
+        }
+    });
+}); };
+function evalKeepDb() {
+    return testDBInfo.name !== undefined;
+}
+//# sourceMappingURL=testPool.js.map

package/dist/testPool.js.map

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

package/dist/types/context.d.ts

@@ -1,56 +1,56 @@
-import Decimal from 'decimal.js';
-import type Table from './table';
-import type { JSON } from './json';
-import type { ColumnTypeByColumns } from './postgres';
-import type { Expression, ValueExpression } from './entity';
-declare type Context<Columns extends Table['columns']> = {
-    col: <columnKey extends keyof Columns & string>(column: columnKey, alias?: string) => ValueExpression<ColumnTypeByColumns<Columns, columnKey>>;
-    colNull: <columnKey extends keyof Columns & string>(column: columnKey, op: null extends ColumnTypeByColumns<Columns, columnKey> ? NullOperator : never, alias?: string) => ValueExpression<boolean>;
-    colBool: <columnKey extends keyof Columns & string>(column: columnKey, op: boolean extends ColumnTypeByColumns<Columns, columnKey> ? BooleanOperator : never, alias?: string) => ValueExpression<boolean>;
-    colCmp: <columnKey extends keyof Columns & string>(column: columnKey, op: CompareOperatorCompatible<ColumnTypeByColumns<Columns, columnKey>, CompareOperator, never>, v: Expression<ColumnTypeByColumns<Columns, columnKey>>, alias?: string) => ValueExpression<boolean>;
-    colList: <columnKey extends keyof Columns & string>(column: columnKey, op: ListOperatorCompatible<ColumnTypeByColumns<Columns, columnKey>, ListOperator, never>, v: Expression<ColumnTypeByColumns<Columns, columnKey>>[] | undefined, alias?: string) => ValueExpression<boolean>;
-    colLike: <columnKey extends keyof Columns & string, Op extends (string extends ColumnTypeByColumns<Columns, columnKey> ? LikeOperator : never)>(column: columnKey, op: Op, v: Op extends 'like' ? Expression<ColumnTypeByColumns<Columns, columnKey>> : Expression<ColumnTypeByColumns<Columns, columnKey>>[] | undefined, alias?: string) => ValueExpression<boolean>;
-    colJson: <columnKey extends keyof Columns & string, Op extends (JSON extends ColumnTypeByColumns<Columns, columnKey> ? JsonOperator : never)>(column: columnKey, op: Op, v: Op extends '@>' | '<@' ? Expression<ColumnTypeByColumns<Columns, columnKey>> : Op extends '?' ? Expression<string> : Op extends '?&' | '?|' ? Expression<string>[] | undefined : never, alias?: string) => ValueExpression<boolean>;
-    colsAnd: ContextScope<Columns>;
-    colsOr: ContextScope<Columns>;
-};
-declare type ContextScope<Columns extends Table['columns']> = (rules: {
-    [columnKey in keyof Columns]?: [
-        op: null extends ColumnTypeByColumns<Columns, columnKey> ? NullOperator : never
-    ] | [
-        op: ColumnTypeByColumns<Columns, columnKey> extends boolean ? BooleanOperator : never
-    ] | [
-        op: CompareOperatorCompatible<ColumnTypeByColumns<Columns, columnKey>, CompareOperator, never>,
-        v: Expression<ColumnTypeByColumns<Columns, columnKey>>
-    ] | [
-        op: ListOperatorCompatible<ColumnTypeByColumns<Columns, columnKey>, ListOperator, never>,
-        v: Expression<ColumnTypeByColumns<Columns, columnKey>>[] | undefined
-    ] | [
-        op: Extract<LikeOperator, 'like'>,
-        v: ColumnTypeByColumns<Columns, columnKey> extends string ? Expression<ColumnTypeByColumns<Columns, columnKey>> : never
-    ] | [
-        op: Extract<LikeOperator, 'like some' | 'like all'>,
-        v: ColumnTypeByColumns<Columns, columnKey> extends string ? Expression<ColumnTypeByColumns<Columns, columnKey>>[] | undefined : never
-    ] | [
-        op: Extract<JsonOperator, '@>' | '<@'>,
-        v: ColumnTypeByColumns<Columns, columnKey> extends JSON ? Expression<ColumnTypeByColumns<Columns, columnKey>> : never
-    ] | [
-        op: Extract<JsonOperator, '?'>,
-        v: ColumnTypeByColumns<Columns, columnKey> extends JSON ? Expression<string> : never
-    ] | [
-        op: Extract<JsonOperator, '?&' | '?|'>,
-        v: ColumnTypeByColumns<Columns, columnKey> extends JSON ? Expression<string>[] | undefined : never
-    ];
-}, alias?: string) => ValueExpression<boolean>;
-declare type CompareOperatorCompatible<T, True, False> = number extends T ? True : bigint extends T ? True : Decimal extends T ? True : string extends T ? True : Date extends T ? True : False;
-declare type ListOperatorCompatible<T, True, False> = number extends T ? True : bigint extends T ? True : Decimal extends T ? True : string extends T ? True : Date extends T ? True : False;
-declare type ArithmeticOperator = '+' | '-' | '*' | '/' | '**';
-declare type NullOperator = '= null' | '!= null';
-declare type BooleanOperator = '= true' | '= false';
-declare type CompareOperator = '=' | '!=' | '>' | '>=' | '<' | '<=';
-declare type ListOperator = 'in' | 'not in';
-declare type LikeOperator = 'like' | 'like all' | 'like some';
-declare type JsonOperator = '?' | '@>' | '<@' | '?|' | '?&';
-export type { Context, CompareOperatorCompatible, ListOperatorCompatible, ContextScope };
-export type { ArithmeticOperator, NullOperator, BooleanOperator, CompareOperator, ListOperator, LikeOperator, JsonOperator };
+import Decimal from 'decimal.js';
+import type Table from './table';
+import type { JSON } from './json';
+import type { ColumnTypeByColumns } from './postgres';
+import type { Expression, ValueExpression } from './entity';
+declare type Context<Columns extends Table['columns']> = {
+    col: <columnKey extends keyof Columns & string>(column: columnKey, alias?: string) => ValueExpression<ColumnTypeByColumns<Columns, columnKey>>;
+    colNull: <columnKey extends keyof Columns & string>(column: columnKey, op: null extends ColumnTypeByColumns<Columns, columnKey> ? NullOperator : never, alias?: string) => ValueExpression<boolean>;
+    colBool: <columnKey extends keyof Columns & string>(column: columnKey, op: boolean extends ColumnTypeByColumns<Columns, columnKey> ? BooleanOperator : never, alias?: string) => ValueExpression<boolean>;
+    colCmp: <columnKey extends keyof Columns & string>(column: columnKey, op: CompareOperatorCompatible<ColumnTypeByColumns<Columns, columnKey>, CompareOperator, never>, v: Expression<ColumnTypeByColumns<Columns, columnKey>>, alias?: string) => ValueExpression<boolean>;
+    colList: <columnKey extends keyof Columns & string>(column: columnKey, op: ListOperatorCompatible<ColumnTypeByColumns<Columns, columnKey>, ListOperator, never>, v: Expression<ColumnTypeByColumns<Columns, columnKey>>[] | undefined, alias?: string) => ValueExpression<boolean>;
+    colLike: <columnKey extends keyof Columns & string, Op extends (string extends ColumnTypeByColumns<Columns, columnKey> ? LikeOperator : never)>(column: columnKey, op: Op, v: Op extends 'like' ? Expression<ColumnTypeByColumns<Columns, columnKey>> : Expression<ColumnTypeByColumns<Columns, columnKey>>[] | undefined, alias?: string) => ValueExpression<boolean>;
+    colJson: <columnKey extends keyof Columns & string, Op extends (JSON extends ColumnTypeByColumns<Columns, columnKey> ? JsonOperator : never)>(column: columnKey, op: Op, v: Op extends '@>' | '<@' ? Expression<ColumnTypeByColumns<Columns, columnKey>> : Op extends '?' ? Expression<string> : Op extends '?&' | '?|' ? Expression<string>[] | undefined : never, alias?: string) => ValueExpression<boolean>;
+    colsAnd: ContextScope<Columns>;
+    colsOr: ContextScope<Columns>;
+};
+declare type ContextScope<Columns extends Table['columns']> = (rules: {
+    [columnKey in keyof Columns]?: [
+        op: null extends ColumnTypeByColumns<Columns, columnKey> ? NullOperator : never
+    ] | [
+        op: ColumnTypeByColumns<Columns, columnKey> extends boolean ? BooleanOperator : never
+    ] | [
+        op: CompareOperatorCompatible<ColumnTypeByColumns<Columns, columnKey>, CompareOperator, never>,
+        v: Expression<ColumnTypeByColumns<Columns, columnKey>>
+    ] | [
+        op: ListOperatorCompatible<ColumnTypeByColumns<Columns, columnKey>, ListOperator, never>,
+        v: Expression<ColumnTypeByColumns<Columns, columnKey>>[] | undefined
+    ] | [
+        op: Extract<LikeOperator, 'like'>,
+        v: ColumnTypeByColumns<Columns, columnKey> extends string ? Expression<ColumnTypeByColumns<Columns, columnKey>> : never
+    ] | [
+        op: Extract<LikeOperator, 'like some' | 'like all'>,
+        v: ColumnTypeByColumns<Columns, columnKey> extends string ? Expression<ColumnTypeByColumns<Columns, columnKey>>[] | undefined : never
+    ] | [
+        op: Extract<JsonOperator, '@>' | '<@'>,
+        v: ColumnTypeByColumns<Columns, columnKey> extends JSON ? Expression<ColumnTypeByColumns<Columns, columnKey>> : never
+    ] | [
+        op: Extract<JsonOperator, '?'>,
+        v: ColumnTypeByColumns<Columns, columnKey> extends JSON ? Expression<string> : never
+    ] | [
+        op: Extract<JsonOperator, '?&' | '?|'>,
+        v: ColumnTypeByColumns<Columns, columnKey> extends JSON ? Expression<string>[] | undefined : never
+    ];
+}, alias?: string) => ValueExpression<boolean>;
+declare type CompareOperatorCompatible<T, True, False> = number extends T ? True : bigint extends T ? True : Decimal extends T ? True : string extends T ? True : Date extends T ? True : False;
+declare type ListOperatorCompatible<T, True, False> = number extends T ? True : bigint extends T ? True : Decimal extends T ? True : string extends T ? True : Date extends T ? True : False;
+declare type ArithmeticOperator = '+' | '-' | '*' | '/' | '**';
+declare type NullOperator = '= null' | '!= null';
+declare type BooleanOperator = '= true' | '= false';
+declare type CompareOperator = '=' | '!=' | '>' | '>=' | '<' | '<=';
+declare type ListOperator = 'in' | 'not in';
+declare type LikeOperator = 'like' | 'like all' | 'like some';
+declare type JsonOperator = '?' | '@>' | '<@' | '?|' | '?&';
+export type { Context, CompareOperatorCompatible, ListOperatorCompatible, ContextScope };
+export type { ArithmeticOperator, NullOperator, BooleanOperator, CompareOperator, ListOperator, LikeOperator, JsonOperator };
 //# sourceMappingURL=context.d.ts.map

package/dist/types/context.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=context.js.map

package/dist/types/entity.d.ts

@@ -1,68 +1,68 @@
-import { JSON } from './json';
-import Decimal from 'decimal.js';
-import type Table from './table';
-import { Context } from './context';
-import type { ClientBase } from 'pg';
-import type { Result } from 'never-catch';
-import type { ColumnTypeByColumns } from './postgres';
-declare type JoinType = 'inner' | 'left' | 'right' | 'full';
-declare type Param = number | bigint | string;
-declare type QueryData = {
-    sql: string;
-    params: Param[];
-};
-declare type TableData = {
-    table: Table;
-    alias: string;
-};
-declare type JoinData = {
-    joinType: JoinType;
-    on: Expression<boolean> | ((contexts: {
-        [k: string]: Context<Table['columns']>;
-    }) => Expression<boolean>);
-};
-declare type Mode = [] | ['count', number] | ['get', 'one' | number];
-declare type CustomColumn<Exp extends Expression<ExpressionTypes>, As extends string> = {
-    exp: Exp;
-    as: As;
-};
-declare type NullableAndDefaultColumns<Columns extends Table['columns']> = {
-    [columnKey in keyof Columns as true extends Columns[columnKey]['nullable'] ? columnKey : false extends Columns[columnKey]['default'] ? never : columnKey]: true extends Columns[columnKey]['nullable'] ? Columns[columnKey] : false extends Columns[columnKey]['default'] ? never : Columns[columnKey];
-};
-declare type TablesColumnsKeys<Tables extends {
-    [key: string]: Table;
-}> = {
-    [tableKey in keyof Tables & string]: `${tableKey}_${keyof Tables[tableKey]['columns'] & string}`;
-}[keyof {
-    [tableKey in keyof Tables & string]: undefined;
-}];
-declare type ExpressionTypes = null | boolean | number | bigint | Decimal | string | Date | JSON;
-declare type Expression<ExpType extends ExpressionTypes> = ExpType | undefined | ValueExpression<ExpType> | QueryExpression<ExpType>;
-declare type ValueExpression<ExpType extends ExpressionTypes> = ['val', ExpType | undefined];
-declare type QueryExpression<ExpType extends ExpressionTypes> = ['qry', ExpType];
-declare type InsertValue<Columns extends Table['columns'], NullableAndDefaultCols extends readonly (keyof NullableAndDefaultColumns<Columns>)[]> = {
-    [columnKey in Exclude<keyof Columns, keyof NullableAndDefaultColumns<Columns>>]: Expression<ColumnTypeByColumns<Columns, columnKey>>;
-} & {
-    [columnKey in Exclude<keyof NullableAndDefaultCols, keyof unknown[]> as NullableAndDefaultCols[columnKey] & string]?: Expression<ColumnTypeByColumns<Columns, NullableAndDefaultCols[columnKey] & string>>;
-};
-declare type UpdateSets<Columns extends Table['columns']> = {
-    [columnKey in keyof Columns & string]?: Expression<ColumnTypeByColumns<Columns, columnKey>>;
-};
-declare type Query<Columns extends Table['columns'], Returning extends readonly (keyof Columns | CustomColumn<Expression<ExpressionTypes>, string>)[]> = {
-    getData: (params?: Param[]) => Result<QueryData, string>;
-    exec: <M extends Mode>(client: ClientBase, mode: M, params?: Param[]) => Promise<Result<QueryResult<Columns, Returning, M>, unknown>>;
-};
-declare type QueryResult<Columns extends Table['columns'], Returning extends readonly (keyof Columns | CustomColumn<Expression<ExpressionTypes>, string>)[], M extends Mode> = M extends ['get', 'one'] ? QueryResultRow<Columns, Returning> : M extends ['get', number] | [] ? QueryResultRow<Columns, Returning>[] : M extends ['count', number] ? boolean : never;
-declare type QueryResultRow<Columns extends Table['columns'], Returning extends readonly (keyof Columns | CustomColumn<Expression<ExpressionTypes>, string>)[]> = {
-    [key in Exclude<keyof Returning, keyof unknown[]> as Returning[key] extends CustomColumn<Expression<ExpressionTypes>, infer As> ? As : Returning[key] & string]: Returning[key] extends CustomColumn<infer Exp, string> ? Exp extends Expression<infer ExpType> ? ExpType : Exp : ColumnTypeByColumns<Columns, Returning[key] & keyof Columns>;
-};
-declare type PartialQuery = {
-    text: string;
-    params: Param[];
-};
-export type { JoinType, Param, QueryData, TableData, JoinData, Mode };
-export type { CustomColumn, NullableAndDefaultColumns, TablesColumnsKeys };
-export type { ExpressionTypes, Expression, ValueExpression, QueryExpression };
-export type { InsertValue, UpdateSets };
-export type { Query, QueryResult, QueryResultRow, PartialQuery };
+import { JSON } from './json';
+import Decimal from 'decimal.js';
+import type Table from './table';
+import { Context } from './context';
+import type { ClientBase } from 'pg';
+import type { Result } from 'never-catch';
+import type { ColumnTypeByColumns } from './postgres';
+declare type JoinType = 'inner' | 'left' | 'right' | 'full';
+declare type Param = number | bigint | string;
+declare type QueryData = {
+    sql: string;
+    params: Param[];
+};
+declare type TableData = {
+    table: Table;
+    alias: string;
+};
+declare type JoinData = {
+    joinType: JoinType;
+    on: Expression<boolean> | ((contexts: {
+        [k: string]: Context<Table['columns']>;
+    }) => Expression<boolean>);
+};
+declare type Mode = [] | ['count', number] | ['get', 'one' | number];
+declare type CustomColumn<Exp extends Expression<ExpressionTypes>, As extends string> = {
+    exp: Exp;
+    as: As;
+};
+declare type NullableAndDefaultColumns<Columns extends Table['columns']> = {
+    [columnKey in keyof Columns as true extends Columns[columnKey]['nullable'] ? columnKey : false extends Columns[columnKey]['default'] ? never : columnKey]: true extends Columns[columnKey]['nullable'] ? Columns[columnKey] : false extends Columns[columnKey]['default'] ? never : Columns[columnKey];
+};
+declare type TablesColumnsKeys<Tables extends {
+    [key: string]: Table;
+}> = {
+    [tableKey in keyof Tables & string]: `${tableKey}_${keyof Tables[tableKey]['columns'] & string}`;
+}[keyof {
+    [tableKey in keyof Tables & string]: undefined;
+}];
+declare type ExpressionTypes = null | boolean | number | bigint | Decimal | string | Date | JSON;
+declare type Expression<ExpType extends ExpressionTypes> = ExpType | undefined | ValueExpression<ExpType> | QueryExpression<ExpType>;
+declare type ValueExpression<ExpType extends ExpressionTypes> = ['val', ExpType | undefined];
+declare type QueryExpression<ExpType extends ExpressionTypes> = ['qry', ExpType];
+declare type InsertValue<Columns extends Table['columns'], NullableAndDefaultCols extends readonly (keyof NullableAndDefaultColumns<Columns>)[]> = {
+    [columnKey in Exclude<keyof Columns, keyof NullableAndDefaultColumns<Columns>>]: Expression<ColumnTypeByColumns<Columns, columnKey>>;
+} & {
+    [columnKey in Exclude<keyof NullableAndDefaultCols, keyof unknown[]> as NullableAndDefaultCols[columnKey] & string]?: Expression<ColumnTypeByColumns<Columns, NullableAndDefaultCols[columnKey] & string>>;
+};
+declare type UpdateSets<Columns extends Table['columns']> = {
+    [columnKey in keyof Columns & string]?: Expression<ColumnTypeByColumns<Columns, columnKey>>;
+};
+declare type Query<Columns extends Table['columns'], Returning extends readonly (keyof Columns | CustomColumn<Expression<ExpressionTypes>, string>)[]> = {
+    getData: (params?: Param[]) => Result<QueryData, string>;
+    exec: <M extends Mode>(client: ClientBase, mode: M, params?: Param[]) => Promise<Result<QueryResult<Columns, Returning, M>, unknown>>;
+};
+declare type QueryResult<Columns extends Table['columns'], Returning extends readonly (keyof Columns | CustomColumn<Expression<ExpressionTypes>, string>)[], M extends Mode> = M extends ['get', 'one'] ? QueryResultRow<Columns, Returning> : M extends ['get', number] | [] ? QueryResultRow<Columns, Returning>[] : M extends ['count', number] ? boolean : never;
+declare type QueryResultRow<Columns extends Table['columns'], Returning extends readonly (keyof Columns | CustomColumn<Expression<ExpressionTypes>, string>)[]> = {
+    [key in Exclude<keyof Returning, keyof unknown[]> as Returning[key] extends CustomColumn<Expression<ExpressionTypes>, infer As> ? As : Returning[key] & string]: Returning[key] extends CustomColumn<infer Exp, string> ? Exp extends Expression<infer ExpType> ? ExpType : Exp : ColumnTypeByColumns<Columns, Returning[key] & keyof Columns>;
+};
+declare type PartialQuery = {
+    text: string;
+    params: Param[];
+};
+export type { JoinType, Param, QueryData, TableData, JoinData, Mode };
+export type { CustomColumn, NullableAndDefaultColumns, TablesColumnsKeys };
+export type { ExpressionTypes, Expression, ValueExpression, QueryExpression };
+export type { InsertValue, UpdateSets };
+export type { Query, QueryResult, QueryResultRow, PartialQuery };
 //# sourceMappingURL=entity.d.ts.map

package/dist/types/entity.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=entity.js.map

package/dist/types/json.d.ts

@@ -1,9 +1,9 @@
-import Decimal from 'decimal.js';
-declare type JSON = JsonObject | JsonArray;
-declare type JsonObject = {
-    [key: string]: BaseJsonValue;
-};
-declare type JsonArray = BaseJsonValue[];
-declare type BaseJsonValue = null | boolean | number | bigint | Decimal | string | Date | JsonObject | JsonArray;
-export type { JSON, JsonObject, JsonArray, BaseJsonValue };
+import Decimal from 'decimal.js';
+declare type JSON = JsonObject | JsonArray;
+declare type JsonObject = {
+    [key: string]: BaseJsonValue;
+};
+declare type JsonArray = BaseJsonValue[];
+declare type BaseJsonValue = null | boolean | number | bigint | Decimal | string | Date | JsonObject | JsonArray;
+export type { JSON, JsonObject, JsonArray, BaseJsonValue };
 //# sourceMappingURL=json.d.ts.map

package/dist/types/json.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=json.js.map

package/dist/types/model.d.ts

@@ -1,12 +1,12 @@
-import type Table from './table';
-import type { ColumnTypeByColumns, ColumnTypeByTable } from './postgres';
-declare type SimpleModel<T extends Table> = {
-    [col in keyof T['columns'] & string]: ColumnTypeByTable<T, col>;
-};
-declare type Model<Columns extends Table['columns'], Requires extends readonly (keyof Columns)[], Optionals extends readonly (keyof Columns)[]> = {
-    [key in Exclude<keyof Requires, keyof unknown[]> as Requires[key] & string]: ColumnTypeByColumns<Columns, Requires[key] & keyof Columns>;
-} & {
-    [key in Exclude<keyof Optionals, keyof unknown[]> as Optionals[key] & string]?: ColumnTypeByColumns<Columns, Optionals[key] & keyof Columns>;
-};
-export type { SimpleModel, Model };
+import type Table from './table';
+import type { ColumnTypeByColumns, ColumnTypeByTable } from './postgres';
+declare type SimpleModel<T extends Table> = {
+    [col in keyof T['columns'] & string]: ColumnTypeByTable<T, col>;
+};
+declare type Model<Columns extends Table['columns'], Requires extends readonly (keyof Columns)[], Optionals extends readonly (keyof Columns)[]> = {
+    [key in Exclude<keyof Requires, keyof unknown[]> as Requires[key] & string]: ColumnTypeByColumns<Columns, Requires[key] & keyof Columns>;
+} & {
+    [key in Exclude<keyof Optionals, keyof unknown[]> as Optionals[key] & string]?: ColumnTypeByColumns<Columns, Optionals[key] & keyof Columns>;
+};
+export type { SimpleModel, Model };
 //# sourceMappingURL=model.d.ts.map

package/dist/types/model.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=model.js.map