@abedmurrar/objection 4.0.0-beta.1 → 4.0.0-beta.11

package/lib/model/modelTableMetadata.js

@@ -1,8 +1,11 @@
-'use strict';
-const { defineNonEnumerableProperty } = require('./modelUtils');
-const { isPromise } = require('../utils/promiseUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchTableMetadata = fetchTableMetadata;
+exports.tableMetadata = tableMetadata;
+const modelUtils_1 = require("./modelUtils");
+const promiseUtils_1 = require("../utils/promiseUtils");
 const TABLE_METADATA = '$$tableMetadata';
-function fetchTableMetadata(modelClass, { parentBuilder = null, knex = null, force = false, table = null } = {}) {
+function fetchTableMetadata(modelClass, { parentBuilder = null, knex = null, force = false, table = null, } = {}) {
     // The table isn't necessarily same as `modelClass.getTableName()` for example if
     // a view is queried instead.
     if (!table) {
@@ -22,7 +25,7 @@ function fetchTableMetadata(modelClass, { parentBuilder = null, knex = null, for
     // Memoize metadata but only for modelClass. The hasOwnProperty check
     // will fail for subclasses and the value gets recreated.
     if (!Object.hasOwn(modelClass, TABLE_METADATA)) {
-        defineNonEnumerableProperty(modelClass, TABLE_METADATA, new Map());
+        (0, modelUtils_1.defineNonEnumerableProperty)(modelClass, TABLE_METADATA, new Map());
     }
     // The cache needs to be checked in addition to calling tableMetadata
     // because the cache may contain a temporary promise in which case
@@ -54,7 +57,7 @@ function fetchTableMetadata(modelClass, { parentBuilder = null, knex = null, for
 function tableMetadata(modelClass, { table } = {}) {
     if (Object.hasOwn(modelClass, TABLE_METADATA)) {
         const metadata = modelClass[TABLE_METADATA].get(table || modelClass.getTableName());
-        if (isPromise(metadata)) {
+        if ((0, promiseUtils_1.isPromise)(metadata)) {
             return null;
         }
         else {
@@ -65,7 +68,3 @@ function tableMetadata(modelClass, { table } = {}) {
         return null;
     }
 }
-module.exports = {
-    fetchTableMetadata,
-    tableMetadata,
-};

package/lib/model/modelToJson.js

@@ -1,7 +1,10 @@
-'use strict';
-const { isInternalProp } = require('../utils/internalPropUtils');
-const { mergeQueryProps } = require('./modelQueryProps');
-const { isObject, cloneDeep, isFunction } = require('../utils/objectUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toJson = toJson;
+exports.toDatabaseJson = toDatabaseJson;
+const internalPropUtils_1 = require("../utils/internalPropUtils");
+const modelQueryProps_1 = require("./modelQueryProps");
+const objectUtils_1 = require("../utils/objectUtils");
 const EMPTY_ARRAY = [];
 function toJson(model, optIn) {
     const modelClass = model.constructor;
@@ -29,7 +32,7 @@ function toDatabaseJson(model, builder) {
     };
     let json = toDatabaseJsonImpl(model, opt);
     json = model.$formatDatabaseJson(json);
-    return mergeQueryProps(model, json, opt.omitFromJson, builder);
+    return (0, modelQueryProps_1.mergeQueryProps)(model, json, opt.omitFromJson, builder);
 }
 function getVirtuals(opt) {
     if (!opt) {
@@ -91,10 +94,10 @@ function assignJsonValue(json, key, value, opt) {
     const type = typeof value;
     if (type !== 'function' &&
         type !== 'undefined' &&
-        !isInternalProp(key) &&
+        !(0, internalPropUtils_1.isInternalProp)(key) &&
         !shouldOmit(opt, key) &&
         shouldPick(opt, key)) {
-        if (isObject(value)) {
+        if ((0, objectUtils_1.isObject)(value)) {
             json[key] = toJsonObject(value, opt);
         }
         else {
@@ -113,7 +116,7 @@ function assignVirtualAttributes(json, model, vAttr, opt) {
     for (let i = 0, l = vAttr.length; i < l; ++i) {
         const key = vAttr[i];
         let value = model[key];
-        if (isFunction(value)) {
+        if ((0, objectUtils_1.isFunction)(value)) {
             value = value.call(model);
         }
         assignJsonValue(json, key, value, opt);
@@ -132,7 +135,7 @@ function toJsonObject(value, opt) {
         return value;
     }
     else if (opt.cloneObjects) {
-        return cloneDeep(value);
+        return (0, objectUtils_1.cloneDeep)(value);
     }
     else {
         return value;
@@ -142,7 +145,7 @@ function toJsonArray(value, opt) {
     const ret = new Array(value.length);
     for (let i = 0, l = ret.length; i < l; ++i) {
         const item = value[i];
-        if (isObject(item)) {
+        if ((0, objectUtils_1.isObject)(item)) {
             ret[i] = toJsonObject(item, opt);
         }
         else {
@@ -151,7 +154,3 @@ function toJsonArray(value, opt) {
     }
     return ret;
 }
-module.exports = {
-    toJson,
-    toDatabaseJson,
-};

package/lib/model/modelUtils.js

@@ -1,5 +1,10 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.staticHiddenProps = exports.hiddenProps = void 0;
+exports.defineNonEnumerableProperty = defineNonEnumerableProperty;
+exports.keyByProps = keyByProps;
 const hiddenProps = ['$$queryProps'];
+exports.hiddenProps = hiddenProps;
 const staticHiddenProps = [
     '$$knex',
     '$$validator',
@@ -16,6 +21,7 @@ const staticHiddenProps = [
     '$$idRelationProperty',
     '$$virtualAttributes',
 ];
+exports.staticHiddenProps = staticHiddenProps;
 function defineNonEnumerableProperty(obj, prop, value) {
     Object.defineProperty(obj, prop, {
         enumerable: false,
@@ -32,9 +38,3 @@ function keyByProps(models, props) {
     }
     return map;
 }
-module.exports = {
-    hiddenProps,
-    staticHiddenProps,
-    defineNonEnumerableProperty,
-    keyByProps,
-};

package/lib/model/modelValidate.js

@@ -1,5 +1,7 @@
-'use strict';
-const { clone } = require('./modelClone');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validate = validate;
+const modelClone_1 = require("./modelClone");
 function validate(model, json, options = {}) {
     json = json || model;
     const inputJson = json;
@@ -12,7 +14,7 @@ function validate(model, json, options = {}) {
         // TODO 1: This should use `json.$toJson()` since we always validate the input representation!
         // TODO 2: This should also keep the relations in the object because some validators may
         //         depend on the relations.
-        json = clone(json, true, true);
+        json = (0, modelClone_1.clone)(json, true, true);
         // We can mutate `json` now that we took a copy of it.
         options = Object.assign({}, options, { mutable: true });
     }
@@ -35,6 +37,3 @@ function validate(model, json, options = {}) {
         return json;
     }
 }
-module.exports = {
-    validate,
-};

package/lib/model/modelValues.js

@@ -1,8 +1,15 @@
-'use strict';
-const { isObject } = require('../utils/objectUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PROP_KEY_PREFIX = void 0;
+exports.propToStr = propToStr;
+exports.values = values;
+exports.hasProps = hasProps;
+exports.propKey = propKey;
+const objectUtils_1 = require("../utils/objectUtils");
 // Property keys needs to be prefixed with a non-numeric character so that
 // they are not considered indexes when used as object keys.
 const PROP_KEY_PREFIX = 'k_';
+exports.PROP_KEY_PREFIX = PROP_KEY_PREFIX;
 function values(model, args) {
     switch (args.length) {
         case 1:
@@ -94,7 +101,7 @@ function propToStr(value) {
     else if (Buffer.isBuffer(value)) {
         return value.toString('hex');
     }
-    else if (isObject(value)) {
+    else if ((0, objectUtils_1.isObject)(value)) {
         return JSON.stringify(value);
     }
     else {
@@ -104,10 +111,3 @@ function propToStr(value) {
 function isNullOrUndefined(val) {
     return val === null || val === undefined;
 }
-module.exports = {
-    PROP_KEY_PREFIX,
-    propToStr,
-    values,
-    hasProps,
-    propKey,
-};

package/lib/model/modelVisitor.js

@@ -1,4 +1,6 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.visitModels = visitModels;
 function visitModels(models, modelClass, visitor) {
     doVisit(models, modelClass, null, null, visitor);
 }
@@ -29,6 +31,3 @@ function visitOne(model, modelClass, parent, rel, visitor) {
         }
     }
 }
-module.exports = {
-    visitModels,
-};

package/lib/objection.js

@@ -1,14 +1,14 @@
 'use strict';
 const { DBError, UniqueViolationError, NotNullViolationError, ForeignKeyViolationError, ConstraintViolationError, CheckViolationError, DataError, } = require('db-errors');
-const { Model: NativeModel } = require('./model/Model');
-const { QueryBuilder: NativeQueryBuilder } = require('./queryBuilder/QueryBuilder');
+const { Model } = require('./model/Model');
+const { QueryBuilder } = require('./queryBuilder/QueryBuilder');
 const { QueryBuilderBase } = require('./queryBuilder/QueryBuilderBase');
 const { QueryBuilderOperation } = require('./queryBuilder/operations/QueryBuilderOperation');
 const { RelationExpression } = require('./queryBuilder/RelationExpression');
 const { ValidationError } = require('./model/ValidationError');
 const { NotFoundError } = require('./model/NotFoundError');
-const { AjvValidator: NativeAjvValidator } = require('./model/AjvValidator');
-const { Validator: NativeValidator } = require('./model/Validator');
+const { AjvValidator } = require('./model/AjvValidator');
+const { Validator } = require('./model/Validator');
 const { Relation } = require('./relations/Relation');
 const { HasOneRelation } = require('./relations/hasOne/HasOneRelation');
 const { HasManyRelation } = require('./relations/hasMany/HasManyRelation');
@@ -23,34 +23,12 @@ const { ref } = require('./queryBuilder/ReferenceBuilder');
 const { val } = require('./queryBuilder/ValueBuilder');
 const { raw } = require('./queryBuilder/RawBuilder');
 const { fn } = require('./queryBuilder/FunctionBuilder');
-const { inherit } = require('./utils/classUtils');
-// We need to wrap the classes, that people can inherit, with ES5 classes
-// so that babel is able to use ES5 inheritance. sigh... Maybe people
-// should stop transpiling node apps to ES5 in the year 2019? Node 6
-// with full class support was released three years ago.
-function Model() {
-    // Nothing to do here.
-}
-function QueryBuilder(...args) {
-    NativeQueryBuilder.init(this, ...args);
-}
-function Validator(...args) {
-    NativeValidator.init(this, ...args);
-}
-function AjvValidator(...args) {
-    NativeAjvValidator.init(this, ...args);
-}
 // Returns the relation mappings as is. This only exists for typescript: it
 // preserves the exact types of the mappings (like the names of `extra`
 // columns) so that the relation types can be inferred from them.
 function defineRelations(relationMappings) {
     return relationMappings;
 }
-inherit(Model, NativeModel);
-inherit(QueryBuilder, NativeQueryBuilder);
-inherit(Validator, NativeValidator);
-inherit(AjvValidator, NativeAjvValidator);
-Model.QueryBuilder = QueryBuilder;
 module.exports = {
     Model,
     QueryBuilder,

package/lib/queryBuilder/FunctionBuilder.js

@@ -1,12 +1,15 @@
-'use strict';
-const { RawBuilder, normalizeRawArgs } = require('./RawBuilder');
-const { ref } = require('./ReferenceBuilder');
-const { expression } = require('./expressions');
-const { asArray, asSingle, isNumber, isObject, isPlainObject } = require('../utils/objectUtils');
-const { getDialect, isMySql, isMariaDb } = require('../utils/knexUtils');
-const { jsonCastsForDialect, JSON_CAST } = require('../utils/mysqlJsonPath');
-const { FUNCTIONS, MARIADB_UNSUPPORTED, buildOrderBy } = require('./functions/mysql');
-class FunctionBuilder extends RawBuilder {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FunctionBuilder = void 0;
+exports.fn = fn;
+const RawBuilder_1 = require("./RawBuilder");
+const ReferenceBuilder_1 = require("./ReferenceBuilder");
+const expressions_1 = require("./expressions");
+const objectUtils_1 = require("../utils/objectUtils");
+const knexUtils_1 = require("../utils/knexUtils");
+const mysqlJsonPath_1 = require("../utils/mysqlJsonPath");
+const mysql_1 = require("./functions/mysql");
+class FunctionBuilder extends RawBuilder_1.RawBuilder {
     constructor(sql, args) {
         super(sql, args);
         // The name of the `fn` helper of a MySQL only function.
@@ -46,16 +49,16 @@ class FunctionBuilder extends RawBuilder {
     }
     toKnexRaw(builder) {
         const knex = builder.unsafeKnex();
-        if (this._mysqlFunction && knex && !isMySql(knex)) {
-            throw new Error(`fn.${this._mysqlFunction}() is a MySQL function and can't be used with ${getDialect(knex)}.`);
+        if (this._mysqlFunction && knex && !(0, knexUtils_1.isMySql)(knex)) {
+            throw new Error(`fn.${this._mysqlFunction}() is a MySQL function and can't be used with ${(0, knexUtils_1.getDialect)(knex)}.`);
         }
         // The SQL of the helpers is created before the database is known.
-        if (knex && isMariaDb(knex) && this._sql.includes(JSON_CAST)) {
+        if (knex && (0, knexUtils_1.isMariaDb)(knex) && this._sql.includes(mysqlJsonPath_1.JSON_CAST)) {
             const copy = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
-            copy._sql = jsonCastsForDialect(this._sql, knex);
+            copy._sql = (0, mysqlJsonPath_1.jsonCastsForDialect)(this._sql, knex);
             return copy.toKnexRaw(builder);
         }
-        if (this._mariaDbError && knex && isMariaDb(knex)) {
+        if (this._mariaDbError && knex && (0, knexUtils_1.isMariaDb)(knex)) {
             throw new Error(this._mariaDbError);
         }
         if (this._windowFunction && !this._over) {
@@ -64,7 +67,7 @@ class FunctionBuilder extends RawBuilder {
         if (this._filters.length === 0 && !this._over) {
             return super.toKnexRaw(builder);
         }
-        return new RawBuilder(...this._buildFilterAndOver()).as(this._as).toKnexRaw(builder);
+        return new RawBuilder_1.RawBuilder(...this._buildFilterAndOver()).as(this._as).toKnexRaw(builder);
     }
     _buildFilterAndOver() {
         let sql = this._sql;
@@ -72,7 +75,7 @@ class FunctionBuilder extends RawBuilder {
         if (this._filters.length !== 0) {
             const condition = this._filters.length === 1
                 ? this._filters[0]
-                : expression(`(${this._filters.map(() => '?').join(' AND ')})`, this._filters);
+                : (0, expressions_1.expression)(`(${this._filters.map(() => '?').join(' AND ')})`, this._filters);
             if (this._aggregated === '*') {
                 sql = sql.replace('*', 'CASE WHEN ? THEN 1 END');
                 args = [condition];
@@ -82,6 +85,7 @@ class FunctionBuilder extends RawBuilder {
                 let i = 0;
                 sql = sql.replace(/\?/g, () => {
                     const arg = args[i++];
+                    // A number: `filter()` needs an aggregate, and '*' is handled above.
                     if (i <= this._aggregated) {
                         filtered.push(condition, arg);
                         return 'CASE WHEN ? THEN ? END';
@@ -102,6 +106,7 @@ class FunctionBuilder extends RawBuilder {
         return [sql, args];
     }
 }
+exports.FunctionBuilder = FunctionBuilder;
 // `fn.case()` is `CASE WHEN condition THEN result ... END` and `fn.case(value)` is
 // `CASE value WHEN other THEN result ... END`.
 class CaseBuilder extends FunctionBuilder {
@@ -146,7 +151,7 @@ class CaseBuilder extends FunctionBuilder {
 class ExcludedBuilder extends FunctionBuilder {
     constructor(column) {
         super('', []);
-        if (isObject(column) && column.isObjectionReferenceBuilder) {
+        if ((0, objectUtils_1.isObject)(column) && column.isObjectionReferenceBuilder) {
             column = column.column;
         }
         if (typeof column !== 'string') {
@@ -155,7 +160,7 @@ class ExcludedBuilder extends FunctionBuilder {
         this._column = column;
     }
     toKnexRaw(builder) {
-        if (isMySql(builder.unsafeKnex())) {
+        if ((0, knexUtils_1.isMySql)(builder.unsafeKnex())) {
             this._sql = 'VALUES(??)';
             this._args = [this._column];
         }
@@ -170,19 +175,19 @@ function buildOver({ partitionBy, orderBy }) {
     const parts = [];
     const args = [];
     if (partitionBy !== undefined) {
-        const columns = asArray(partitionBy).map((it) => (typeof it === 'string' ? ref(it) : it));
+        const columns = (0, objectUtils_1.asArray)(partitionBy).map((it) => typeof it === 'string' ? (0, ReferenceBuilder_1.ref)(it) : it);
         parts.push(`PARTITION BY ${columns.map(() => '?').join(', ')}`);
         args.push(...columns);
     }
     if (orderBy !== undefined) {
-        const [orderBySql, orderByArgs] = buildOrderBy('over()', orderBy);
+        const [orderBySql, orderByArgs] = (0, mysql_1.buildOrderBy)('over()', orderBy);
         parts.push(`ORDER BY ${orderBySql}`);
         args.push(...orderByArgs);
     }
     return [parts.join(' '), args];
 }
 function fn(...argsIn) {
-    const { sql, args } = normalizeRawArgs(argsIn);
+    const { sql, args } = (0, RawBuilder_1.normalizeRawArgs)(argsIn);
     return new FunctionBuilder(`${sql}(${args.map(() => '?').join(', ')})`, args);
 }
 for (const func of ['coalesce', 'concat', 'upper', 'lower']) {
@@ -199,8 +204,10 @@ fn.count = (...args) => {
     return aggregate(fn('COUNT', args), args.length);
 };
 fn.now = (precision) => {
-    precision = parseInt(asSingle(precision), 10);
-    if (isNaN(precision) || !isNumber(precision)) {
+    // `parseInt()` converts a number to a string first.
+    precision = parseInt((0, objectUtils_1.asSingle)(precision), 10);
+    // A number, from `parseInt()`.
+    if (isNaN(precision) || !(0, objectUtils_1.isNumber)(precision)) {
         precision = 6;
     }
     // We need to use a literal precision instead of a binding here
@@ -211,13 +218,14 @@ fn.now = (precision) => {
 };
 fn.case = (...args) => new CaseBuilder(args.length !== 0, args[0]);
 fn.exists = (subquery) => {
-    if (!isObject(subquery) || !subquery.isObjectionQueryBuilderBase) {
+    if (!(0, objectUtils_1.isObject)(subquery) ||
+        !subquery.isObjectionQueryBuilderBase) {
         throw new Error('fn.exists() takes a query.');
     }
     return new FunctionBuilder('(EXISTS ?)', [subquery]);
 };
 fn.excluded = (column) => new ExcludedBuilder(column);
-for (const [name, sql, , , options = {}] of FUNCTIONS) {
+for (const [name, sql, , , options = {}] of mysql_1.FUNCTIONS) {
     // `defineProperty` since `fn.length` is a read-only property of functions.
     Object.defineProperty(fn, name, {
         configurable: true,
@@ -235,7 +243,7 @@ function createMySqlFunction(name, sql, options) {
         if (!options.portable) {
             builder._mysqlFunction = name;
         }
-        const mariaDbReason = MARIADB_UNSUPPORTED[name] && MARIADB_UNSUPPORTED[name](args);
+        const mariaDbReason = mysql_1.MARIADB_UNSUPPORTED[name] && mysql_1.MARIADB_UNSUPPORTED[name](args);
         if (mariaDbReason) {
             builder._mariaDbError = `fn.${name}() ${mariaDbReason}.`;
         }
@@ -276,7 +284,7 @@ function isJsonArg(json, i) {
     }
 }
 function isJsonValue(value) {
-    return Array.isArray(value) || isPlainObject(value);
+    return Array.isArray(value) || (0, objectUtils_1.isPlainObject)(value);
 }
 Object.defineProperties(FunctionBuilder.prototype, {
     isObjectionFunctionBuilder: {
@@ -285,7 +293,3 @@ Object.defineProperties(FunctionBuilder.prototype, {
         value: true,
     },
 });
-module.exports = {
-    FunctionBuilder,
-    fn,
-};

package/lib/queryBuilder/InternalOptions.js

@@ -1,4 +1,6 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InternalOptions = void 0;
 class InternalOptions {
     constructor() {
         this.skipUndefined = false;
@@ -19,6 +21,4 @@ class InternalOptions {
         return copy;
     }
 }
-module.exports = {
-    InternalOptions,
-};
+exports.InternalOptions = InternalOptions;

package/lib/queryBuilder/JoinBuilder.js

@@ -1,124 +1,125 @@
-'use strict';
-const { QueryBuilderOperationSupport } = require('./QueryBuilderOperationSupport');
-const { KnexOperation } = require('./operations/KnexOperation');
-const { WhereInOperation } = require('./operations/WhereInOperation');
-const { QueryBuilderOperation } = require('./operations/QueryBuilderOperation');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JoinBuilder = void 0;
+const QueryBuilderOperationSupport_1 = require("./QueryBuilderOperationSupport");
+const KnexOperation_1 = require("./operations/KnexOperation");
+const WhereInOperation_1 = require("./operations/WhereInOperation");
+const QueryBuilderOperation_1 = require("./operations/QueryBuilderOperation");
 // knex's `join.on(a, b).or.on(c, d)`: `or` makes the next condition an `or`.
-class OrOperation extends QueryBuilderOperation {
+class OrOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
+    // knex's typings don't declare the `or` getter.
     onBuildKnex(knexBuilder) {
         return knexBuilder.or;
     }
 }
-class JoinBuilder extends QueryBuilderOperationSupport {
+class JoinBuilder extends QueryBuilderOperationSupport_1.QueryBuilderOperationSupport {
     get or() {
         return this.addOperation(new OrOperation('or'), []);
     }
     using(...args) {
-        return this.addOperation(new KnexOperation('using'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('using'), args);
     }
     on(...args) {
-        return this.addOperation(new KnexOperation('on'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('on'), args);
     }
     orOn(...args) {
-        return this.addOperation(new KnexOperation('orOn'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('orOn'), args);
     }
     onBetween(...args) {
-        return this.addOperation(new KnexOperation('onBetween'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('onBetween'), args);
     }
     onNotBetween(...args) {
-        return this.addOperation(new KnexOperation('onNotBetween'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('onNotBetween'), args);
     }
     orOnBetween(...args) {
-        return this.addOperation(new KnexOperation('orOnBetween'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('orOnBetween'), args);
     }
     orOnNotBetween(...args) {
-        return this.addOperation(new KnexOperation('orOnNotBetween'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('orOnNotBetween'), args);
     }
     onIn(...args) {
-        return this.addOperation(new WhereInOperation('onIn', { rawMethod: 'on' }), args);
+        return this.addOperation(new WhereInOperation_1.WhereInOperation('onIn', { rawMethod: 'on' }), args);
     }
     onNotIn(...args) {
-        return this.addOperation(new WhereInOperation('onNotIn', { rawMethod: 'on', not: true }), args);
+        return this.addOperation(new WhereInOperation_1.WhereInOperation('onNotIn', { rawMethod: 'on', not: true }), args);
     }
     orOnIn(...args) {
-        return this.addOperation(new WhereInOperation('orOnIn', { rawMethod: 'orOn' }), args);
+        return this.addOperation(new WhereInOperation_1.WhereInOperation('orOnIn', { rawMethod: 'orOn' }), args);
     }
     orOnNotIn(...args) {
-        return this.addOperation(new WhereInOperation('orOnNotIn', { rawMethod: 'orOn', not: true }), args);
+        return this.addOperation(new WhereInOperation_1.WhereInOperation('orOnNotIn', { rawMethod: 'orOn', not: true }), args);
     }
     onNull(...args) {
-        return this.addOperation(new KnexOperation('onNull'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('onNull'), args);
     }
     orOnNull(...args) {
-        return this.addOperation(new KnexOperation('orOnNull'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('orOnNull'), args);
     }
     onNotNull(...args) {
-        return this.addOperation(new KnexOperation('onNotNull'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('onNotNull'), args);
     }
     orOnNotNull(...args) {
-        return this.addOperation(new KnexOperation('orOnNotNull'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('orOnNotNull'), args);
     }
     onExists(...args) {
-        return this.addOperation(new KnexOperation('onExists'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('onExists'), args);
     }
     orOnExists(...args) {
-        return this.addOperation(new KnexOperation('orOnExists'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('orOnExists'), args);
     }
     onNotExists(...args) {
-        return this.addOperation(new KnexOperation('onNotExists'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('onNotExists'), args);
     }
     orOnNotExists(...args) {
-        return this.addOperation(new KnexOperation('orOnNotExists'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('orOnNotExists'), args);
     }
     type(...args) {
-        return this.addOperation(new KnexOperation('type'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('type'), args);
     }
     andOn(...args) {
-        return this.addOperation(new KnexOperation('andOn'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('andOn'), args);
     }
     andOnIn(...args) {
-        return this.addOperation(new WhereInOperation('andOnIn', { rawMethod: 'andOn' }), args);
+        return this.addOperation(new WhereInOperation_1.WhereInOperation('andOnIn', { rawMethod: 'andOn' }), args);
     }
     andOnNotIn(...args) {
-        return this.addOperation(new WhereInOperation('andOnNotIn', { rawMethod: 'andOn', not: true }), args);
+        return this.addOperation(new WhereInOperation_1.WhereInOperation('andOnNotIn', { rawMethod: 'andOn', not: true }), args);
     }
     andOnNull(...args) {
-        return this.addOperation(new KnexOperation('andOnNull'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('andOnNull'), args);
     }
     andOnNotNull(...args) {
-        return this.addOperation(new KnexOperation('andOnNotNull'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('andOnNotNull'), args);
     }
     andOnExists(...args) {
-        return this.addOperation(new KnexOperation('andOnExists'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('andOnExists'), args);
     }
     andOnNotExists(...args) {
-        return this.addOperation(new KnexOperation('andOnNotExists'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('andOnNotExists'), args);
     }
     andOnBetween(...args) {
-        return this.addOperation(new KnexOperation('andOnBetween'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('andOnBetween'), args);
     }
     andOnNotBetween(...args) {
-        return this.addOperation(new KnexOperation('andOnNotBetween'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('andOnNotBetween'), args);
     }
     onJsonPathEquals(...args) {
-        return this.addOperation(new KnexOperation('onJsonPathEquals'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('onJsonPathEquals'), args);
     }
     orOnJsonPathEquals(...args) {
-        return this.addOperation(new KnexOperation('orOnJsonPathEquals'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('orOnJsonPathEquals'), args);
     }
     andOnJsonPathEquals(...args) {
-        return this.addOperation(new KnexOperation('andOnJsonPathEquals'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('andOnJsonPathEquals'), args);
     }
     onVal(...args) {
-        return this.addOperation(new KnexOperation('onVal'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('onVal'), args);
     }
     andOnVal(...args) {
-        return this.addOperation(new KnexOperation('andOnVal'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('andOnVal'), args);
     }
     orOnVal(...args) {
-        return this.addOperation(new KnexOperation('orOnVal'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('orOnVal'), args);
     }
 }
-module.exports = {
-    JoinBuilder,
-};
+exports.JoinBuilder = JoinBuilder;