tspace-mysql 1.9.1 → 1.9.2

package/dist/lib/core/Join.js

@@ -1,42 +1,104 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Join = void 0;
+const utils_1 = require("../utils");
 class Join {
-    self;
+    builder;
     type;
     join = [];
-    constructor(self, type = 'INNER_JOIN') {
-        this.self = self;
+    constructor(builder, type = 'INNER_JOIN') {
+        this.builder = builder;
         this.type = type;
     }
+    /**
+     * The 'on' method is used to Adds an ON condition to the current JOIN clause.
+     *
+     * Creates a join condition by comparing two column references.
+     * Both parameters must be fully qualified column names in the
+     * format `table.column`.
+     *
+     * @param localKey - The local column reference (e.g. `users.id`).
+     * @param referenceKey - The referenced column reference (e.g. `posts.user_id`).
+     *
+     * @returns The current join builder instance for method chaining.
+     *
+     * @example
+     * new User()
+     *   .join((join) => join.on('users.id', 'posts.user_id'));
+     *
+     */
     on(localKey, referenceKey) {
-        const table = referenceKey?.split('.')?.shift();
+        const table = referenceKey.split('.')?.shift();
         const join = [
-            `${this.self['$constants'](this.type)}`,
-            `\`${table}\` ${this.self['$constants']('ON')}`,
-            `${this.self.bindColumn(localKey)} = ${this.self.bindColumn(String(referenceKey))}`
+            `${this.builder['$constants'](this.type)}`,
+            `\`${table}\` ${this.builder['$constants']('ON')}`,
+            `${this.builder.bindColumn(localKey)} = ${this.builder.bindColumn(String(referenceKey))}`
         ].join(' ');
         this.join.push(join);
         return this;
     }
-    and(localKey, referenceKey) {
+    and(localKey, operator, referenceKey) {
         if (!this.join.length) {
-            return this.on(localKey, referenceKey);
+            throw new Error("Call .on() before using this");
+        }
+        [referenceKey, operator] = utils_1.utils.valueAndOperator(referenceKey, operator, arguments.length === 2);
+        if (typeof referenceKey === 'string' && /\./.test(referenceKey)) {
+            const join = [
+                this.builder['$constants']('AND'),
+                this.builder.bindColumn(localKey),
+                operator,
+                this.builder.bindColumn(String(referenceKey))
+            ].join(' ');
+            this.join.push(join);
+            return this;
+        }
+        const format = this.formatValue(referenceKey, operator);
+        if (format.isRaw) {
+            const join = [
+                this.builder['$constants']('AND'),
+                this.builder.bindColumn(localKey),
+                format.value
+            ].join(' ');
+            this.join.push(join);
+            return this;
         }
         const join = [
-            `${this.self['$constants']('AND')}`,
-            `${this.self.bindColumn(localKey)} = ${this.self.bindColumn(String(referenceKey))}`
+            this.builder['$constants']('AND'),
+            this.builder.bindColumn(localKey),
+            format.operator,
+            format.value
         ].join(' ');
         this.join.push(join);
         return this;
     }
-    or(localKey, referenceKey) {
+    or(localKey, operator, referenceKey) {
         if (!this.join.length) {
-            return this.on(localKey, referenceKey);
+            throw new Error("Call .on() before using this");
+        }
+        [referenceKey, operator] = utils_1.utils.valueAndOperator(referenceKey, operator, arguments.length === 2);
+        if (typeof referenceKey === 'string' && /\./.test(referenceKey)) {
+            const join = [
+                `${this.builder['$constants']('OR')}`,
+                `${this.builder.bindColumn(localKey)} ${operator} ${this.builder.bindColumn(String(referenceKey))}`
+            ].join(' ');
+            this.join.push(join);
+            return this;
+        }
+        const format = this.formatValue(referenceKey, operator);
+        if (format.isRaw) {
+            const join = [
+                this.builder['$constants']('OR'),
+                this.builder.bindColumn(localKey),
+                format.value
+            ].join(' ');
+            this.join.push(join);
+            return this;
         }
         const join = [
-            `${this.self['$constants']('OR')}`,
-            `${this.self.bindColumn(localKey)} = ${this.self.bindColumn(String(referenceKey))}`
+            this.builder['$constants']('OR'),
+            this.builder.bindColumn(localKey),
+            format.operator,
+            format.value
         ].join(' ');
         this.join.push(join);
         return this;
@@ -44,6 +106,21 @@ class Join {
     toString() {
         return this.join.join(' ');
     }
+    formatValue(value, operator) {
+        let formated = utils_1.utils.formatQueryValue(value);
+        if (utils_1.utils.checkValueHasRaw(value)) {
+            return { isRaw: true, value: formated, operator: null };
+        }
+        if (value == null) {
+            formated = '';
+            operator = `${this.builder['$constants']('IS_NULL')}`;
+        }
+        if (Array.isArray(value)) {
+            formated = `(${value.map((v) => utils_1.utils.formatQueryValue(v)).join(', ')})`;
+            operator = `${this.builder['$constants']('IN')}`;
+        }
+        return { isRaw: false, value: formated, operator };
+    }
 }
 exports.Join = Join;
 exports.default = Join;

package/dist/lib/core/Join.js.map

@@ -1 +1 @@
-{"version":3,"file":"Join.js","sourceRoot":"","sources":["../../../src/lib/core/Join.ts"],"names":[],"mappings":";;;AACA,MAAM,IAAI;IAIQ;IACA;IAJN,IAAI,GAAc,EAAE,CAAA;IAE5B,YACc,IAAc,EACd,OAAkE,YAAY;QAD9E,SAAI,GAAJ,IAAI,CAAU;QACd,SAAI,GAAJ,IAAI,CAA0E;IACzF,CAAC;IAEJ,EAAE,CAAE,QAA+B,EAAE,YAAqC;QAEtE,MAAM,KAAK,GAAG,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAA;QAE/C,MAAM,IAAI,GAAG;YACT,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACvC,KAAK,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE;YAC/C,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE;SACtF,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpB,OAAO,IAAI,CAAA;IACf,CAAC;IAED,GAAG,CAAE,QAA+B,EAAE,YAAqC;QAEvE,IAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAEnB,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QAC1C,CAAC;QAED,MAAM,IAAI,GAAG;YACT,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,EAAE;YACnC,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE;SACtF,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpB,OAAO,IAAI,CAAA;IACf,CAAC;IAED,EAAE,CAAE,QAA+B,EAAE,YAAqC;QAEtE,IAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAEnB,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QAC1C,CAAC;QAED,MAAM,IAAI,GAAG;YACT,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE;YAClC,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE;SACtF,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpB,OAAO,IAAI,CAAA;IACf,CAAC;IAES,QAAQ;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9B,CAAC;CACJ;AAEQ,oBAAI;AACb,kBAAe,IAAI,CAAA"}
+{"version":3,"file":"Join.js","sourceRoot":"","sources":["../../../src/lib/core/Join.ts"],"names":[],"mappings":"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"}

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

@@ -1,19 +1,75 @@
 import { Model } from "./Model";
 import type { TModelOrObject } from "../types";
 declare class JoinModel {
-    protected model: Model;
+    protected model: Model<any, any, any>;
     protected type: 'INNER_JOIN' | 'LEFT_JOIN' | 'RIGHT_JOIN' | 'CROSS_JOIN';
     private join;
-    constructor(model: Model, type?: 'INNER_JOIN' | 'LEFT_JOIN' | 'RIGHT_JOIN' | 'CROSS_JOIN');
+    constructor(model: Model<any, any, any>, type?: 'INNER_JOIN' | 'LEFT_JOIN' | 'RIGHT_JOIN' | 'CROSS_JOIN');
+    /**
+     * The 'on' method is used to Adds an ON condition to the current JOIN clause.
+     *
+     * Creates a join condition by comparing two column references.
+     * Both parameters must be fully qualified column names in the
+     * format `table.column`.
+     *
+     * @param {TModelOrObject | `${string}.${string}`} m1 The model  (e.g User)
+     * @param {TModelOrObject | `${string}.${string}`} m2 The model reference (e.g. Post).
+     *
+     * @returns The current join model instance for method chaining.
+     *
+     * @example
+     * new User()
+     *   .joinModel((join) => join.on(User, Post));
+     *
+     */
+    on(m1: `${string}.${string}`, m2: `${string}.${string}`): this;
     on(m1: TModelOrObject, m2: TModelOrObject): this;
-    and(m1: TModelOrObject, m2: TModelOrObject): this;
-    or(m1: TModelOrObject, m2: TModelOrObject): this;
-    onRaw(localKey: `${string}.${string}`, referenceKey?: `${string}.${string}`): this;
-    andRaw(localKey: `${string}.${string}`, referenceKey?: `${string}.${string}`): this;
-    orRaw(localKey: `${string}.${string}`, referenceKey?: `${string}.${string}`): this;
+    /**
+     * The 'and' method is used to Adds an additional condition to the current JOIN ON clause using AND.
+     *
+     * This method must be called after `.on()`.
+     *
+     * @param localKey - The left-side column reference.
+     * @param referenceKey - The right-side column reference.
+     *
+     * @returns The current join model instance.
+     *
+     * @example
+     * new User()
+     *   .joinModel((join) =>
+     *     join
+     *       .on(User, Post)
+     *       .and(Post.columnRef('type'), 'article')
+     *       .and(Post.columnRef('published'), true)
+     *   );
+     */
+    and(localKey: `${string}.${string}`, referenceKey: `${string}.${string}` | string | number | boolean | null | (string | number | boolean | null)[]): this;
+    and(localKey: `${string}.${string}`, operator: "=" | "<" | ">" | "!=" | "<>" | "<=" | ">=" | "LIKE" | "like", referenceKey?: `${string}.${string}` | string | number | boolean | null | (string | number | boolean | null)[]): this;
+    /**
+     * The 'or' method is used to Adds an additional condition to the current JOIN ON clause using OR.
+     *
+     * This method must be called after `.on()`.
+     *
+     * @param localKey - The left-side column reference.
+     * @param referenceKey - The right-side column reference.
+     *
+     * @returns The current join model instance.
+     *
+     * @example
+     * new User()
+     *   .joinModel((join) =>
+     *     join
+     *       .on(User, Post)
+     *       .or('posts.type', 'article')
+     *       .or('posts.published', true)
+     *   );
+     */
+    or(localKey: `${string}.${string}`, referenceKey: `${string}.${string}` | string | number | boolean | null | (string | number | boolean | null)[]): this;
+    or(localKey: `${string}.${string}`, operator: "=" | "<" | ">" | "!=" | "<>" | "<=" | ">=" | "LIKE" | "like", referenceKey?: `${string}.${string}` | string | number | boolean | null | (string | number | boolean | null)[]): this;
     protected toString(): string;
-    private _handleJoinModel;
-    private _handleCombindJoin;
+    private handleJoinModel;
+    private onRaw;
+    private formatValue;
 }
 export { JoinModel };
 export default JoinModel;

package/dist/lib/core/JoinModel.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoinModel = void 0;
 const pluralize_1 = __importDefault(require("pluralize"));
 const Model_1 = require("./Model");
+const utils_1 = require("../utils");
 class JoinModel {
     model;
     type;
@@ -15,7 +16,10 @@ class JoinModel {
         this.type = type;
     }
     on(m1, m2) {
-        const { alias1, alias2, table1, table2, model1, model2, localKey, foreignKey } = this._handleJoinModel(m1, m2);
+        if (typeof m1 === 'string' && typeof m2 === 'string') {
+            return this.onRaw(m1, m2);
+        }
+        const { alias1, alias2, table1, table2, model1, model2, localKey, foreignKey } = this.handleJoinModel(m1, m2);
         const copy = new Model_1.Model()
             .copyModel(this.model);
         const joinMethod = {
@@ -50,52 +54,66 @@ class JoinModel {
         this.join.push(...copy['$state'].get('JOIN'));
         return this;
     }
-    and(m1, m2) {
+    and(localKey, operator, referenceKey) {
         if (!this.join.length) {
-            return this.on(m1, m2);
+            throw new Error("Call .on() before using this");
         }
-        const { alias1, alias2, table1, table2, localKey, foreignKey } = this._handleJoinModel(m1, m2);
-        const join = this._handleCombindJoin(`${alias1 === '' ? table1 : `${table1}|${alias1}`}.${localKey}`, `${alias2 === '' ? table2 : `${table2}|${alias2}`}.${foreignKey}`);
-        this.join.push(join);
-        return this;
-    }
-    or(m1, m2) {
-        if (!this.join.length) {
-            return this.on(m1, m2);
+        [referenceKey, operator] = utils_1.utils.valueAndOperator(referenceKey, operator, arguments.length === 2);
+        if (typeof referenceKey === 'string' && /\./.test(referenceKey)) {
+            const join = [
+                `${this.model['$constants']('AND')}`,
+                `${this.model.bindColumn(localKey)} ${operator} ${this.model.bindColumn(String(referenceKey))}`
+            ].join(' ');
+            this.join.push(join);
+            return this;
         }
-        const { alias1, alias2, table1, table2, model1, model2, localKey, foreignKey } = this._handleJoinModel(m1, m2);
-        const join = this._handleCombindJoin(`${alias1 === '' ? table1 : `${table1}|${alias1}`}.${localKey}`, `${alias2 === '' ? table2 : `${table2}|${alias2}`}.${foreignKey}`, { operator: 'OR' });
-        this.join.push(join);
-        return this;
-    }
-    onRaw(localKey, referenceKey) {
-        const table = referenceKey?.split('.')?.shift();
-        const join = [
-            `${this.model['$constants'](this.type)}`,
-            `\`${table}\` ${this.model['$constants']('ON')}`,
-            `${this.model.bindColumn(localKey)} = ${this.model.bindColumn(String(referenceKey))}`
-        ].join(' ');
-        this.join.push(join);
-        return this;
-    }
-    andRaw(localKey, referenceKey) {
-        if (!this.join.length) {
-            return this.onRaw(localKey, referenceKey);
+        const format = this.formatValue(referenceKey, operator);
+        if (format.isRaw) {
+            const join = [
+                this.model['$constants']('AND'),
+                this.model.bindColumn(localKey),
+                format.value
+            ].join(' ');
+            this.join.push(join);
+            return this;
         }
         const join = [
-            `${this.model['$constants']('AND')}`,
-            `${this.model.bindColumn(localKey)} = ${this.model.bindColumn(String(referenceKey))}`
+            this.model['$constants']('AND'),
+            this.model.bindColumn(localKey),
+            format.operator,
+            format.value
         ].join(' ');
         this.join.push(join);
         return this;
     }
-    orRaw(localKey, referenceKey) {
+    or(localKey, operator, referenceKey) {
         if (!this.join.length) {
-            return this.onRaw(localKey, referenceKey);
+            throw new Error("Call .on() before using this");
+        }
+        [referenceKey, operator] = utils_1.utils.valueAndOperator(referenceKey, operator, arguments.length === 2);
+        if (typeof referenceKey === 'string' && /\./.test(referenceKey)) {
+            const join = [
+                `${this.model['$constants']('OR')}`,
+                `${this.model.bindColumn(localKey)} ${operator} ${this.model.bindColumn(String(referenceKey))}`
+            ].join(' ');
+            this.join.push(join);
+            return this;
+        }
+        const format = this.formatValue(referenceKey, operator);
+        if (format.isRaw) {
+            const join = [
+                this.model['$constants']('OR'),
+                this.model.bindColumn(localKey),
+                format.value
+            ].join(' ');
+            this.join.push(join);
+            return this;
         }
         const join = [
-            `${this.model['$constants']('OR')}`,
-            `${this.model.bindColumn(localKey)} = ${this.model.bindColumn(String(referenceKey))}`
+            this.model['$constants']('OR'),
+            this.model.bindColumn(localKey),
+            format.operator,
+            format.value
         ].join(' ');
         this.join.push(join);
         return this;
@@ -103,7 +121,10 @@ class JoinModel {
     toString() {
         return this.join.join(' ');
     }
-    _handleJoinModel(m1, m2) {
+    handleJoinModel(m1, m2) {
+        if (typeof m1 === 'string' || typeof m2 === 'string') {
+            throw new Error('Please Check your callback');
+        }
         let model1 = typeof m1 === 'object' ? new m1.model() : new m1();
         let model2 = typeof m2 === 'object' ? new m2.model() : new m2();
         let localKey = typeof m1 === 'object' ? m1.key != null && m1.key !== '' ? String(m1.key) : '' : '';
@@ -138,22 +159,30 @@ class JoinModel {
             foreignKey
         };
     }
-    _handleCombindJoin(localKey, referenceKey, { operator = 'AND' } = {}) {
-        let table = referenceKey?.split('.')?.shift();
-        const aliasRef = /\|/.test(String(table));
-        if (aliasRef) {
-            const tableRef = table?.split('|')?.shift();
-            table = `\`${tableRef}\` ${this.model['$constants']('AS')} \`${table?.split('|')?.pop()}\``;
-            referenceKey = String(referenceKey?.split('|')?.pop() ?? referenceKey);
-        }
-        const alias = /\|/.test(String(localKey));
-        if (alias) {
-            localKey = String(localKey?.split('|')?.pop() ?? localKey);
-        }
-        return [
-            `${this.model['$constants'](operator)}`,
+    onRaw(localKey, referenceKey) {
+        const table = referenceKey.split('.')?.shift();
+        const join = [
+            `${this.model['$constants'](this.type)}`,
+            `\`${table}\` ${this.model['$constants']('ON')}`,
             `${this.model.bindColumn(localKey)} = ${this.model.bindColumn(String(referenceKey))}`
         ].join(' ');
+        this.join.push(join);
+        return this;
+    }
+    formatValue(value, operator) {
+        let formated = utils_1.utils.formatQueryValue(value);
+        if (utils_1.utils.checkValueHasRaw(value)) {
+            return { isRaw: true, value: formated, operator: null };
+        }
+        if (value == null) {
+            formated = '';
+            operator = `${this.model['$constants']('IS_NULL')}`;
+        }
+        if (Array.isArray(value)) {
+            formated = `(${value.map((v) => utils_1.utils.formatQueryValue(v)).join(', ')})`;
+            operator = `${this.model['$constants']('IN')}`;
+        }
+        return { isRaw: false, value: formated, operator };
     }
 }
 exports.JoinModel = JoinModel;

package/dist/lib/core/JoinModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"JoinModel.js","sourceRoot":"","sources":["../../../src/lib/core/JoinModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JoinModel.js","sourceRoot":"","sources":["../../../src/lib/core/JoinModel.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAiC;AACjC,mCAA+B;AAI/B,oCAAgC;AAGhC,MAAM,SAAS;IAIG;IACA;IAJN,IAAI,GAAc,EAAE,CAAA;IAE5B,YACc,KAA0B,EAC1B,OAAkE,YAAY;QAD9E,UAAK,GAAL,KAAK,CAAqB;QAC1B,SAAI,GAAJ,IAAI,CAA0E;IACzF,CAAC;IAqBG,EAAE,CACL,EAA0C,EAC1C,EAA0C;QAG1C,IAAG,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;YAClD,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,EACF,MAAM,EACN,MAAM,EACN,MAAM,EACN,MAAM,EACN,MAAM,EACN,MAAM,EACN,QAAQ,EACR,UAAU,EACb,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;QAEhC,MAAM,IAAI,GAAG,IAAI,aAAK,EAAE;aACvB,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAEtB,MAAM,UAAU,GAAG;YACf,YAAY,EAAG,MAAM;YACrB,WAAW,EAAI,UAAU;YACzB,YAAY,EAAG,WAAW;YAC1B,YAAY,EAAG,WAAW;SAC7B,CAAC,IAAI,CAAC,IAAI,CAAoD,CAAA;QAE/D,IAAI,CAAC,UAAU,CAAC,CACZ,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,MAAM,EAAE,IAAI,QAAQ,EAAE,EAC/D,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,MAAM,EAAE,IAAI,UAAU,EAAE,CACpE,CAAA;QAED,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YAEhF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAEhD,MAAM,WAAW,GAAG,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAA;YAEtG,MAAM,gBAAgB,GAAG;gBACrB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;gBAClC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC;aACtC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAE,CAAC,EAAE,CAAC;gBAC5D,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;YACrC,CAAC;QACL,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAChD,MAAM,WAAW,GAAG,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAA;YACtG,MAAM,gBAAgB,GAAG;gBACrB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;gBAClC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC;aACtC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAE,CAAC,EAAE,CAAC;gBAC5D,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;YACrC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAE7C,OAAO,IAAI,CAAA;IACf,CAAC;IAgCM,GAAG,CACN,QAA+B,EAC/B,QAAuE,EACvE,YAA8G;QAG9G,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACpD,CAAC;QAED,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG,aAAK,CAAC,gBAAgB,CAC7C,YAAY,EACZ,QAAQ,EACR,SAAS,CAAC,MAAM,KAAK,CAAC,CACzB,CAAC;QAEF,IAAG,OAAO,YAAY,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,GAAG;gBACT,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,EAAE;gBACpC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE;aAClG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAEpB,OAAO,IAAI,CAAA;QACf,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,EAAG,QAAQ,CAAC,CAAC;QAEzD,IAAG,MAAM,CAAC,KAAK,EAAE,CAAC;YAEd,MAAM,IAAI,GAAG;gBACT,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC;gBAC/B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC/B,MAAM,CAAC,KAAK;aACf,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAErB,OAAO,IAAI,CAAA;QACf,CAAC;QAED,MAAM,IAAI,GAAG;YACT,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC/B,MAAM,CAAC,QAAQ;YACf,MAAM,CAAC,KAAK;SACf,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpB,OAAO,IAAI,CAAA;IACf,CAAC;IA+BM,EAAE,CACL,QAA+B,EAC/B,QAAuE,EACvE,YAA8G;QAG9G,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACpD,CAAC;QAED,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG,aAAK,CAAC,gBAAgB,CAC7C,YAAY,EACZ,QAAQ,EACR,SAAS,CAAC,MAAM,KAAK,CAAC,CACzB,CAAC;QAEF,IAAG,OAAO,YAAY,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,GAAG;gBACT,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE;gBACnC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE;aAClG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAEpB,OAAO,IAAI,CAAA;QACf,CAAC;QAEA,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,EAAG,QAAQ,CAAC,CAAC;QAE1D,IAAG,MAAM,CAAC,KAAK,EAAE,CAAC;YAEd,MAAM,IAAI,GAAG;gBACT,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;gBAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC/B,MAAM,CAAC,KAAK;aACf,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAErB,OAAO,IAAI,CAAA;QACf,CAAC;QAED,MAAM,IAAI,GAAG;YACT,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC/B,MAAM,CAAC,QAAQ;YACf,MAAM,CAAC,KAAK;SACf,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpB,OAAO,IAAI,CAAA;IACf,CAAC;IAES,QAAQ;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAEO,eAAe,CACnB,EAA2B,EAC3B,EAA2B;QAG3B,IAAG,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QACjD,CAAC;QAED,IAAI,MAAM,GAAiB,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAA;QAC7E,IAAI,MAAM,GAAiB,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAA;QAC7E,IAAI,QAAQ,GAAe,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAC9G,IAAI,UAAU,GAAa,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAC9G,IAAI,MAAM,GAAiB,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,IAAI,IAAI,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAC5G,IAAI,MAAM,GAAiB,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,IAAI,IAAI,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAE5G,IAAG,MAAM,KAAK,EAAE,EAAE,CAAC;YACf,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;gBAChF,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YAC5B,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACxB,CAAC;QAED,IAAG,MAAM,KAAK,EAAE,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACxB,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,EAAE,CAAA;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,EAAE,CAAA;QAEpC,QAAQ,GAAK,CAAE,QAAQ,KAAK,EAAE,IAAI,QAAQ,IAAI,IAAI,CAAE;YAChD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,QAAQ,CAAA;QAEd,UAAU,GAAG,CAAE,UAAU,KAAK,EAAE,IAAI,UAAU,IAAI,IAAI,CAAE;YACpD,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,mBAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;YAC7D,CAAC,CAAC,UAAU,CAAA;QAEhB,OAAO;YACH,MAAM;YACN,MAAM;YACN,MAAM;YACN,MAAM;YACN,MAAM;YACN,MAAM;YACN,QAAQ;YACR,UAAU;SACb,CAAA;IACL,CAAC;IAEO,KAAK,CAAE,QAA+B,EAAE,YAAoC;QAEhF,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;QAE/C,MAAM,IAAI,GAAG;YACT,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACxC,KAAK,KAAK,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE;YAChD,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE;SACxF,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpB,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,WAAW,CAAE,KAAe,EAAG,QAAiB;QACpD,IAAI,QAAQ,GAAG,aAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAG,aAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,KAAK,EAAG,IAAI,EAAG,KAAK,EAAG,QAAQ,EAAG,QAAQ,EAAG,IAAI,EAAE,CAAA;QAChE,CAAC;QAED,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAChB,QAAQ,GAAG,EAAE,CAAC;YACd,QAAQ,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;QACxD,CAAC;QAED,IAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,QAAQ,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YACzE,QAAQ,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,CAAC;QAED,OAAO,EAAE,KAAK,EAAG,KAAK,EAAG,KAAK,EAAG,QAAQ,EAAG,QAAQ,EAAE,CAAC;IAC3D,CAAC;CACJ;AAEQ,8BAAS;AAClB,kBAAe,SAAS,CAAA"}

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

@@ -22,24 +22,24 @@ declare class ModelMeta<M extends Model> {
      * Build a fully qualified column reference with an optional alias.
      *
      * @param {T.ColumnKeys<M>} column - The column key.
-     * @param {{ alias?: string | null }} [options] - Optional alias for the table.
+     * @param {{ alias?: string | null }} [opts] - Optional alias for the table.
      * @returns {`${string}.${T.ColumnKeys<M>}`} The column reference.
      */
-    columnReference(column: T.ColumnKeys<M>, { alias, raw }?: {
+    columnReference<K extends T.ColumnKeys<M> = T.ColumnKeys<M>>(column: K, opts?: {
         alias?: string | null;
         raw?: boolean | null;
-    }): `${string}.${T.ColumnKeys<M>}`;
+    }): `${string}.${K}`;
     /**
      * Alias for {@link columnReference}.
      *
      * @param {T.ColumnKeys<M>} column - The column key.
-     * @param {{ alias?: string | null }} [options] - Optional alias for the table.
-     * @returns {`${string}.${T.ColumnKeys<M>}`} The column reference.
+     * @param {{ alias?: string | null }} [opts] - Optional alias for the table.
+     * @returns {`${string}.${K}`} The column reference.
      */
-    columnRef(column: T.ColumnKeys<M>, { alias, raw }?: {
+    columnRef<K extends T.ColumnKeys<M> = T.ColumnKeys<M>>(column: K, opts?: {
         alias?: string | null;
         raw?: boolean | null;
-    }): `${string}.${T.ColumnKeys<M>}`;
+    }): `${string}.${K}`;
     /**
      * Get all column keys defined in the model schema.
      *

package/dist/lib/core/Meta.js

@@ -27,15 +27,15 @@ class ModelMeta {
      * Build a fully qualified column reference with an optional alias.
      *
      * @param {T.ColumnKeys<M>} column - The column key.
-     * @param {{ alias?: string | null }} [options] - Optional alias for the table.
+     * @param {{ alias?: string | null }} [opts] - Optional alias for the table.
      * @returns {`${string}.${T.ColumnKeys<M>}`} The column reference.
      */
-    columnReference(column, { alias = null, raw = null } = {}) {
+    columnReference(column, opts = {}) {
         let base = `\`${this.table()}\`.\`${String(column)}\``;
-        if (alias) {
-            base = `\`${alias}\`.\`${String(column)}\``;
+        if (opts.alias) {
+            base = `\`${opts.alias}\`.\`${String(column)}\``;
         }
-        if (raw) {
+        if (opts.raw) {
             base = base.replace(/`/g, '');
         }
         return base;
@@ -44,11 +44,11 @@ class ModelMeta {
      * Alias for {@link columnReference}.
      *
      * @param {T.ColumnKeys<M>} column - The column key.
-     * @param {{ alias?: string | null }} [options] - Optional alias for the table.
-     * @returns {`${string}.${T.ColumnKeys<M>}`} The column reference.
+     * @param {{ alias?: string | null }} [opts] - Optional alias for the table.
+     * @returns {`${string}.${K}`} The column reference.
      */
-    columnRef(column, { alias = null, raw = null } = {}) {
-        return this.columnReference(column, { alias, raw });
+    columnRef(column, opts = {}) {
+        return this.columnReference(column, opts);
     }
     /**
      * Get all column keys defined in the model schema.
@@ -223,6 +223,7 @@ class ModelMeta {
         if (!entry)
             return [];
         const blueprint = entry[1];
+        //@ts-ignore
         return blueprint['_enum'];
     }
 }

package/dist/lib/core/Meta.js.map

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