@abedmurrar/objection 4.0.0-beta.0 → 4.0.0-beta.10

package/lib/queryBuilder/operations/KnexOperation.js

@@ -1,11 +1,11 @@
-'use strict';
-const { ObjectionToKnexConvertingOperation } = require('./ObjectionToKnexConvertingOperation');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KnexOperation = void 0;
+const ObjectionToKnexConvertingOperation_1 = require("./ObjectionToKnexConvertingOperation");
 // An operation that simply calls the equivalent knex method.
-class KnexOperation extends ObjectionToKnexConvertingOperation {
+class KnexOperation extends ObjectionToKnexConvertingOperation_1.ObjectionToKnexConvertingOperation {
     onBuildKnex(knexBuilder, builder) {
         return knexBuilder[this.name].apply(knexBuilder, this.getKnexArgs(builder));
     }
 }
-module.exports = {
-    KnexOperation,
-};
+exports.KnexOperation = KnexOperation;

package/lib/queryBuilder/operations/MergeOperation.js

@@ -1,8 +1,10 @@
-'use strict';
-const { isFunction, isEmpty, isObject } = require('../../utils/objectUtils');
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-const { convertFieldExpressionsToRaw } = require('./UpdateOperation');
-class MergeOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeOperation = void 0;
+const objectUtils_1 = require("../../utils/objectUtils");
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+const UpdateOperation_1 = require("./UpdateOperation");
+class MergeOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.model = null;
@@ -10,7 +12,7 @@ class MergeOperation extends QueryBuilderOperation {
     }
     onAdd(builder, args) {
         this.args = args;
-        if (!isEmpty(args) && isObject(args[0]) && !Array.isArray(args[0])) {
+        if (!(0, objectUtils_1.isEmpty)(args) && (0, objectUtils_1.isObject)(args[0]) && !Array.isArray(args[0])) {
             const json = args[0];
             const modelClass = builder.modelClass();
             this.model = modelClass.ensureModel(json, { patch: true });
@@ -18,12 +20,12 @@ class MergeOperation extends QueryBuilderOperation {
         return true;
     }
     onBuildKnex(knexBuilder, builder) {
-        if (!isFunction(knexBuilder.merge)) {
+        if (!(0, objectUtils_1.isFunction)(knexBuilder.merge)) {
             throw new Error('merge method can only be chained right after onConflict method');
         }
         if (this.model) {
             const json = this.model.$toDatabaseJson(builder);
-            const convertedJson = convertFieldExpressionsToRaw(builder, this.model, json);
+            const convertedJson = (0, UpdateOperation_1.convertFieldExpressionsToRaw)(builder, this.model, json);
             return knexBuilder.merge(convertedJson);
         }
         return knexBuilder.merge(...this.args);
@@ -38,6 +40,4 @@ class MergeOperation extends QueryBuilderOperation {
         return clone;
     }
 }
-module.exports = {
-    MergeOperation,
-};
+exports.MergeOperation = MergeOperation;

package/lib/queryBuilder/operations/ObjectionToKnexConvertingOperation.js

@@ -1,18 +1,23 @@
-'use strict';
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-const { isPlainObject, isObject, isFunction, once } = require('../../utils/objectUtils');
-const { isKnexQueryBuilder, isKnexJoinBuilder } = require('../../utils/knexUtils');
-const { transformation } = require('../transformations');
-const { isModelClass } = require('../../utils/resolveModel');
-const getJoinBuilder = once(() => require('../JoinBuilder').JoinBuilder);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObjectionToKnexConvertingOperation = void 0;
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+const objectUtils_1 = require("../../utils/objectUtils");
+const knexUtils_1 = require("../../utils/knexUtils");
+const transformations_1 = require("../transformations");
+const resolveModel_1 = require("../../utils/resolveModel");
+// `JoinBuilder` requires this file, so it's required lazily.
+const getJoinBuilder = (0, objectUtils_1.once)(() => require('../JoinBuilder').JoinBuilder);
 // An abstract operation base class that converts all arguments from objection types
 // to knex types. For example objection query builders are converted into knex query
 // builders and objection RawBuilder instances are converted into knex Raw instances.
-class ObjectionToKnexConvertingOperation extends QueryBuilderOperation {
+class ObjectionToKnexConvertingOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.args = null;
     }
+    // The arguments converted for knex. `any`: they are arbitrary user values
+    // that the subclasses pass on to knex.
     getKnexArgs(builder) {
         return convertArgs(this.name, builder, this.args);
     }
@@ -26,6 +31,7 @@ class ObjectionToKnexConvertingOperation extends QueryBuilderOperation {
         return clone;
     }
 }
+exports.ObjectionToKnexConvertingOperation = ObjectionToKnexConvertingOperation;
 function shouldBeAdded(opName, builder, args) {
     const skipUndefined = builder.internalOptions().skipUndefined;
     for (let i = 0, l = args.length; i < l; ++i) {
@@ -53,18 +59,18 @@ function convertArgs(opName, builder, args) {
         else if (isArray(arg)) {
             return convertArray(arg, builder, i, opName, skipUndefined);
         }
-        else if (isModelClass(arg)) {
+        else if ((0, resolveModel_1.isModelClass)(arg)) {
             // Model classes can be used in place of their table names, for example
             // `join(Pet, ...)`. They are functions, so this check must come first.
             return arg.getTableName();
         }
-        else if (isFunction(arg)) {
+        else if ((0, objectUtils_1.isFunction)(arg)) {
             return convertFunction(arg, builder);
         }
         else if (isModel(arg)) {
             return convertModel(arg);
         }
-        else if (isPlainObject(arg)) {
+        else if ((0, objectUtils_1.isPlainObject)(arg)) {
             return convertPlainObject(arg, builder, i, opName, skipUndefined);
         }
         else {
@@ -76,16 +82,17 @@ function isUndefined(item) {
     return item === undefined;
 }
 function hasToKnexRawMethod(item) {
-    return isObject(item) && isFunction(item.toKnexRaw);
+    return (0, objectUtils_1.isObject)(item) && (0, objectUtils_1.isFunction)(item.toKnexRaw);
 }
 function convertToKnexRaw(item, builder) {
     return item.toKnexRaw(builder);
 }
 function isObjectionQueryBuilderBase(item) {
-    return isObject(item) && item.isObjectionQueryBuilderBase === true;
+    return ((0, objectUtils_1.isObject)(item) &&
+        item.isObjectionQueryBuilderBase === true);
 }
 function convertQueryBuilderBase(item, builder) {
-    item = transformation.onConvertQueryBuilderBase(item, builder);
+    item = transformations_1.transformation.onConvertQueryBuilderBase(item, builder);
     return item.subqueryOf(builder).toKnexQuery();
 }
 function isArray(item) {
@@ -104,7 +111,7 @@ function convertArray(arr, builder, i, opName, skipUndefined) {
         else if (isObjectionQueryBuilderBase(item)) {
             return convertQueryBuilderBase(item, builder);
         }
-        else if (isModelClass(item)) {
+        else if ((0, resolveModel_1.isModelClass)(item)) {
             return item.getTableName();
         }
         else {
@@ -114,10 +121,10 @@ function convertArray(arr, builder, i, opName, skipUndefined) {
 }
 function convertFunction(func, builder) {
     return function convertedKnexArgumentFunction(...args) {
-        if (isKnexQueryBuilder(this)) {
+        if ((0, knexUtils_1.isKnexQueryBuilder)(this)) {
             convertQueryBuilderFunction(this, func, builder);
         }
-        else if (isKnexJoinBuilder(this)) {
+        else if ((0, knexUtils_1.isKnexJoinBuilder)(this)) {
             convertJoinBuilderFunction(this, func, builder);
         }
         else {
@@ -139,7 +146,7 @@ function convertJoinBuilderFunction(knexJoinBuilder, func, builder) {
     joinClauseBuilder.toKnexQuery(knexJoinBuilder);
 }
 function isModel(item) {
-    return isObject(item) && item.$isObjectionModel;
+    return (0, objectUtils_1.isObject)(item) && item.$isObjectionModel;
 }
 function convertModel(model) {
     return model.$toDatabaseJson();
@@ -158,7 +165,7 @@ function convertPlainObject(obj, builder, i, opName, skipUndefined) {
         else if (isObjectionQueryBuilderBase(item)) {
             out[key] = convertQueryBuilderBase(item, builder);
         }
-        else if (isModelClass(item)) {
+        else if ((0, resolveModel_1.isModelClass)(item)) {
             // `{ alias: ModelClass }`.
             out[key] = item.getTableName();
         }
@@ -168,6 +175,3 @@ function convertPlainObject(obj, builder, i, opName, skipUndefined) {
         return out;
     }, {});
 }
-module.exports = {
-    ObjectionToKnexConvertingOperation,
-};

package/lib/queryBuilder/operations/OnBuildKnexOperation.js

@@ -1,6 +1,8 @@
-'use strict';
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-class OnBuildKnexOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OnBuildKnexOperation = void 0;
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+class OnBuildKnexOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.func = null;
@@ -18,6 +20,4 @@ class OnBuildKnexOperation extends QueryBuilderOperation {
         return clone;
     }
 }
-module.exports = {
-    OnBuildKnexOperation,
-};
+exports.OnBuildKnexOperation = OnBuildKnexOperation;

package/lib/queryBuilder/operations/OnBuildOperation.js

@@ -1,6 +1,8 @@
-'use strict';
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-class OnBuildOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OnBuildOperation = void 0;
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+class OnBuildOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.func = null;
@@ -18,6 +20,4 @@ class OnBuildOperation extends QueryBuilderOperation {
         return clone;
     }
 }
-module.exports = {
-    OnBuildOperation,
-};
+exports.OnBuildOperation = OnBuildOperation;

package/lib/queryBuilder/operations/OnErrorOperation.js

@@ -1,6 +1,8 @@
-'use strict';
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-class OnErrorOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OnErrorOperation = void 0;
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+class OnErrorOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.func = null;
@@ -18,6 +20,4 @@ class OnErrorOperation extends QueryBuilderOperation {
         return clone;
     }
 }
-module.exports = {
-    OnErrorOperation,
-};
+exports.OnErrorOperation = OnErrorOperation;

package/lib/queryBuilder/operations/QueryBuilderOperation.js

@@ -1,4 +1,6 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryBuilderOperation = void 0;
 const hookNameToHasMethodName = {
     onAdd: 'hasOnAdd',
     onBefore1: 'hasOnBefore1',
@@ -55,6 +57,8 @@ class QueryBuilderOperation {
     hasOnAdd() {
         return true;
     }
+    // The hooks below that do nothing return `void`. That allows the overrides to
+    // return anything.
     // This is called as the first thing when the query is executed but before
     // the actual database operation (knex query) is executed.
     //
@@ -246,6 +250,7 @@ class QueryBuilderOperation {
         return true;
     }
 }
+exports.QueryBuilderOperation = QueryBuilderOperation;
 Object.defineProperties(QueryBuilderOperation, {
     isObjectionQueryBuilderOperationClass: {
         enumerable: false,
@@ -253,6 +258,3 @@ Object.defineProperties(QueryBuilderOperation, {
         value: true,
     },
 });
-module.exports = {
-    QueryBuilderOperation,
-};

package/lib/queryBuilder/operations/RangeOperation.js

@@ -1,6 +1,8 @@
-'use strict';
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-class RangeOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RangeOperation = void 0;
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+class RangeOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.resultSizeBuilder = null;
@@ -23,6 +25,7 @@ class RangeOperation extends QueryBuilderOperation {
         const resultSize = await this.resultSizeBuilder.resultSize();
         return {
             results,
+            // `parseInt` converts the number to a string first, as it always has.
             total: parseInt(resultSize, 10),
         };
     }
@@ -32,6 +35,4 @@ class RangeOperation extends QueryBuilderOperation {
         return clone;
     }
 }
-module.exports = {
-    RangeOperation,
-};
+exports.RangeOperation = RangeOperation;

package/lib/queryBuilder/operations/RelateOperation.js

@@ -1,6 +1,8 @@
-'use strict';
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-class RelateOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RelateOperation = void 0;
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+class RelateOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.relation = opt.relation;
@@ -15,6 +17,4 @@ class RelateOperation extends QueryBuilderOperation {
         return clone;
     }
 }
-module.exports = {
-    RelateOperation,
-};
+exports.RelateOperation = RelateOperation;

package/lib/queryBuilder/operations/ReturningOperation.js

@@ -1,13 +1,15 @@
-'use strict';
-const { flatten } = require('../../utils/objectUtils');
-const { ObjectionToKnexConvertingOperation } = require('./ObjectionToKnexConvertingOperation');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReturningOperation = void 0;
+const objectUtils_1 = require("../../utils/objectUtils");
+const ObjectionToKnexConvertingOperation_1 = require("./ObjectionToKnexConvertingOperation");
 // This class's only purpose is to normalize the arguments into an array.
 //
 // In knex, if a single column is given to `returning` it returns an array with the that column's value
 // in it. If an array is given with a one item inside, the return value is an object.
-class ReturningOperation extends ObjectionToKnexConvertingOperation {
+class ReturningOperation extends ObjectionToKnexConvertingOperation_1.ObjectionToKnexConvertingOperation {
     onAdd(builder, args) {
-        args = flatten(args);
+        args = (0, objectUtils_1.flatten)(args);
         // Don't add an empty returning list.
         if (args.length === 0) {
             return false;
@@ -19,6 +21,4 @@ class ReturningOperation extends ObjectionToKnexConvertingOperation {
         return knexBuilder.returning(this.getKnexArgs(builder));
     }
 }
-module.exports = {
-    ReturningOperation,
-};
+exports.ReturningOperation = ReturningOperation;

package/lib/queryBuilder/operations/RunAfterOperation.js

@@ -1,6 +1,8 @@
-'use strict';
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-class RunAfterOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RunAfterOperation = void 0;
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+class RunAfterOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.func = null;
@@ -18,6 +20,4 @@ class RunAfterOperation extends QueryBuilderOperation {
         return clone;
     }
 }
-module.exports = {
-    RunAfterOperation,
-};
+exports.RunAfterOperation = RunAfterOperation;

package/lib/queryBuilder/operations/RunBeforeOperation.js

@@ -1,6 +1,8 @@
-'use strict';
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-class RunBeforeOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RunBeforeOperation = void 0;
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+class RunBeforeOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.func = null;
@@ -18,6 +20,4 @@ class RunBeforeOperation extends QueryBuilderOperation {
         return clone;
     }
 }
-module.exports = {
-    RunBeforeOperation,
-};
+exports.RunBeforeOperation = RunBeforeOperation;

package/lib/queryBuilder/operations/UnrelateOperation.js

@@ -1,6 +1,8 @@
-'use strict';
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-class UnrelateOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnrelateOperation = void 0;
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+class UnrelateOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.relation = opt.relation;
@@ -13,6 +15,4 @@ class UnrelateOperation extends QueryBuilderOperation {
         return clone;
     }
 }
-module.exports = {
-    UnrelateOperation,
-};
+exports.UnrelateOperation = UnrelateOperation;

package/lib/queryBuilder/operations/UpdateAndFetchOperation.js

@@ -1,12 +1,14 @@
-'use strict';
-const { withWhereScope } = require('../whereScopes');
-const { DelegateOperation } = require('./DelegateOperation');
-const { FindByIdOperation } = require('./FindByIdOperation');
-const { UpdateOperation } = require('./UpdateOperation');
-class UpdateAndFetchOperation extends DelegateOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateAndFetchOperation = void 0;
+const whereScopes_1 = require("../whereScopes");
+const DelegateOperation_1 = require("./DelegateOperation");
+const FindByIdOperation_1 = require("./FindByIdOperation");
+const UpdateOperation_1 = require("./UpdateOperation");
+class UpdateAndFetchOperation extends DelegateOperation_1.DelegateOperation {
     constructor(name, opt) {
         super(name, opt);
-        if (!this.delegate.is(UpdateOperation)) {
+        if (!this.delegate.is(UpdateOperation_1.UpdateOperation)) {
             throw new Error('Invalid delegate');
         }
         this.id = null;
@@ -21,7 +23,7 @@ class UpdateAndFetchOperation extends DelegateOperation {
     }
     onBuild(builder) {
         if (!this.skipIdWhere) {
-            withWhereScope(builder, () => builder.findById(this.id));
+            (0, whereScopes_1.withWhereScope)(builder, () => builder.findById(this.id));
         }
         super.onBuild(builder);
     }
@@ -47,7 +49,7 @@ class UpdateAndFetchOperation extends DelegateOperation {
         return fetched ? this.model : undefined;
     }
     toFindOperation() {
-        return new FindByIdOperation('findById', {
+        return new FindByIdOperation_1.FindByIdOperation('findById', {
             id: this.id,
         });
     }
@@ -58,6 +60,4 @@ class UpdateAndFetchOperation extends DelegateOperation {
         return clone;
     }
 }
-module.exports = {
-    UpdateAndFetchOperation,
-};
+exports.UpdateAndFetchOperation = UpdateAndFetchOperation;

package/lib/queryBuilder/operations/UpdateOperation.js

@@ -1,12 +1,15 @@
-'use strict';
-const { ref } = require('../../queryBuilder/ReferenceBuilder');
-const { isEmpty } = require('../../utils/objectUtils');
-const { isKnexRaw, isKnexQueryBuilder } = require('../../utils/knexUtils');
-const { toPgJsonPathLiteral, getJsonDialect } = require('../../utils/postgresJsonPath');
-const { toMySqlJsonPath, toJsonSql } = require('../../utils/mysqlJsonPath');
-const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-const { StaticHookArguments, hasStaticHook } = require('../StaticHookArguments');
-class UpdateOperation extends QueryBuilderOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateOperation = void 0;
+exports.convertFieldExpressionsToRaw = convertFieldExpressionsToRaw;
+const ReferenceBuilder_1 = require("../../queryBuilder/ReferenceBuilder");
+const objectUtils_1 = require("../../utils/objectUtils");
+const knexUtils_1 = require("../../utils/knexUtils");
+const postgresJsonPath_1 = require("../../utils/postgresJsonPath");
+const mysqlJsonPath_1 = require("../../utils/mysqlJsonPath");
+const QueryBuilderOperation_1 = require("./QueryBuilderOperation");
+const StaticHookArguments_1 = require("../StaticHookArguments");
+class UpdateOperation extends QueryBuilderOperation_1.QueryBuilderOperation {
     constructor(name, opt) {
         super(name, opt);
         this.model = null;
@@ -24,7 +27,7 @@ class UpdateOperation extends QueryBuilderOperation {
     }
     onBefore3(builder) {
         const row = this.model.$toDatabaseJson(builder);
-        if (isEmpty(row)) {
+        if ((0, objectUtils_1.isEmpty)(row)) {
             // Resolve the query if there is nothing to update.
             builder.resolve(0);
         }
@@ -46,6 +49,7 @@ class UpdateOperation extends QueryBuilderOperation {
         return clone;
     }
 }
+exports.UpdateOperation = UpdateOperation;
 async function callBeforeUpdate(builder, model, modelOptions) {
     await callInstanceBeforeUpdate(builder, model, modelOptions);
     return callStaticBeforeUpdate(builder);
@@ -54,10 +58,10 @@ function callInstanceBeforeUpdate(builder, model, modelOptions) {
     return model.$beforeUpdate(modelOptions, builder.context());
 }
 function callStaticBeforeUpdate(builder) {
-    if (!hasStaticHook(builder.modelClass(), 'beforeUpdate')) {
+    if (!(0, StaticHookArguments_1.hasStaticHook)(builder.modelClass(), 'beforeUpdate')) {
         return undefined;
     }
-    const args = StaticHookArguments.create({ builder });
+    const args = StaticHookArguments_1.StaticHookArguments.create({ builder });
     return builder.modelClass().beforeUpdate(args);
 }
 async function callAfterUpdate(builder, model, modelOptions, result) {
@@ -68,10 +72,10 @@ function callInstanceAfterUpdate(builder, model, modelOptions) {
     return model.$afterUpdate(modelOptions, builder.context());
 }
 async function callStaticAfterUpdate(builder, result) {
-    if (!hasStaticHook(builder.modelClass(), 'afterUpdate')) {
+    if (!(0, StaticHookArguments_1.hasStaticHook)(builder.modelClass(), 'afterUpdate')) {
         return result;
     }
-    const args = StaticHookArguments.create({ builder, result });
+    const args = StaticHookArguments_1.StaticHookArguments.create({ builder, result });
     const maybeResult = await builder.modelClass().afterUpdate(args);
     if (maybeResult === undefined) {
         return result;
@@ -91,22 +95,22 @@ function convertFieldExpressionsToRaw(builder, model, json) {
             // on postgres and to
             // `col` : raw("JSON_SET(COALESCE(`col`, JSON_OBJECT()), '$.\"attr\"', JSON_EXTRACT(`other`, '$.\"lol\"'))")
             // on mysql. A NULL column is treated as an empty object (or array).
-            const parsed = ref(key);
+            const parsed = (0, ReferenceBuilder_1.ref)(key);
             const access = parsed.parsedExpr.access;
-            const isSqlValue = isKnexQueryBuilder(val) || isKnexRaw(val);
+            const isSqlValue = (0, knexUtils_1.isKnexQueryBuilder)(val) || (0, knexUtils_1.isKnexRaw)(val);
             // When the column is set by an earlier key, that expression is used instead.
             const target = convertedJson[parsed.column] || parsed.column;
             const isFirstSet = !convertedJson[parsed.column];
             if (!isSqlValue) {
                 val = JSON.stringify(val);
             }
-            if (getJsonDialect(knex, key) === 'mysql') {
+            if ((0, postgresJsonPath_1.getJsonDialect)(knex, key) === 'mysql') {
                 const empty = access[0].type === 'array' ? 'JSON_ARRAY()' : 'JSON_OBJECT()';
                 const column = isFirstSet ? `COALESCE(??, ${empty})` : '??';
-                const value = isSqlValue ? '?' : toJsonSql('?', knex);
+                const value = isSqlValue ? '?' : (0, mysqlJsonPath_1.toJsonSql)('?', knex);
                 convertedJson[parsed.column] = knex.raw(`JSON_SET(${column}, ?, ${value})`, [
                     target,
-                    toMySqlJsonPath(access),
+                    (0, mysqlJsonPath_1.toMySqlJsonPath)(access),
                     val,
                 ]);
             }
@@ -114,7 +118,7 @@ function convertFieldExpressionsToRaw(builder, model, json) {
                 const empty = access[0].type === 'array' ? `'[]'::jsonb` : `'{}'::jsonb`;
                 const column = isFirstSet ? `COALESCE(??, ${empty})` : '??';
                 const value = isSqlValue ? 'to_jsonb(?)' : '?';
-                convertedJson[parsed.column] = knex.raw(`jsonb_set(${column}, ${toPgJsonPathLiteral(access)}, ${value}, true)`, [target, val]);
+                convertedJson[parsed.column] = knex.raw(`jsonb_set(${column}, ${(0, postgresJsonPath_1.toPgJsonPathLiteral)(access)}, ${value}, true)`, [target, val]);
             }
             delete model[key];
         }
@@ -124,7 +128,3 @@ function convertFieldExpressionsToRaw(builder, model, json) {
     }
     return convertedJson;
 }
-module.exports = {
-    UpdateOperation,
-    convertFieldExpressionsToRaw,
-};

package/lib/queryBuilder/operations/UpsertGraphAndFetchOperation.js

@@ -1,11 +1,13 @@
-'use strict';
-const { DelegateOperation } = require('./DelegateOperation');
-const { UpsertGraphOperation } = require('./UpsertGraphOperation');
-const { RelationExpression } = require('../RelationExpression');
-class UpsertGraphAndFetchOperation extends DelegateOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpsertGraphAndFetchOperation = void 0;
+const DelegateOperation_1 = require("./DelegateOperation");
+const UpsertGraphOperation_1 = require("./UpsertGraphOperation");
+const RelationExpression_1 = require("../RelationExpression");
+class UpsertGraphAndFetchOperation extends DelegateOperation_1.DelegateOperation {
     constructor(name, opt) {
         super(name, opt);
-        if (!this.delegate.is(UpsertGraphOperation)) {
+        if (!this.delegate.is(UpsertGraphOperation_1.UpsertGraphOperation)) {
             throw new Error('Invalid delegate');
         }
     }
@@ -19,7 +21,7 @@ class UpsertGraphAndFetchOperation extends DelegateOperation {
         if (this.models.length === 0) {
             return this.isArray ? [] : null;
         }
-        const eager = RelationExpression.fromModelGraph(this.models);
+        const eager = RelationExpression_1.RelationExpression.fromModelGraph(this.models);
         const modelClass = this.models[0].constructor;
         const ids = this.models.map((model) => model.$id());
         const models = await modelClass
@@ -30,6 +32,4 @@ class UpsertGraphAndFetchOperation extends DelegateOperation {
         return this.isArray ? models : models[0] || null;
     }
 }
-module.exports = {
-    UpsertGraphAndFetchOperation,
-};
+exports.UpsertGraphAndFetchOperation = UpsertGraphAndFetchOperation;