@abedmurrar/objection 4.0.0-beta.4 → 4.0.0-beta.6

package/lib/queryBuilder/QueryBuilder.js

@@ -1,45 +1,47 @@
-'use strict';
-const { withWhereScope } = require('./whereScopes');
-const { wrapError } = require('db-errors');
-const { raw } = require('./RawBuilder');
-const { createModifier } = require('../utils/createModifier');
-const { ValidationErrorType } = require('../model/ValidationError');
-const { isObject, isString, isFunction, last, flatten } = require('../utils/objectUtils');
-const { RelationExpression, DuplicateRelationError } = require('./RelationExpression');
-const { assertIdNotUndefined } = require('../utils/assert');
-const { Selection } = require('./operations/select/Selection');
-const { QueryBuilderContext } = require('./QueryBuilderContext');
-const { QueryBuilderBase } = require('./QueryBuilderBase');
-const { FindOperation } = require('./operations/FindOperation');
-const { DeleteOperation } = require('./operations/DeleteOperation');
-const { UpdateOperation } = require('./operations/UpdateOperation');
-const { InsertOperation } = require('./operations/InsertOperation');
-const { RelateOperation } = require('./operations/RelateOperation');
-const { UnrelateOperation } = require('./operations/UnrelateOperation');
-const { JoinEagerOperation } = require('./operations/eager/JoinEagerOperation');
-const { NaiveEagerOperation } = require('./operations/eager/NaiveEagerOperation');
-const { WhereInEagerOperation } = require('./operations/eager/WhereInEagerOperation');
-const { InsertGraphAndFetchOperation } = require('./operations/InsertGraphAndFetchOperation');
-const { UpsertGraphAndFetchOperation } = require('./operations/UpsertGraphAndFetchOperation');
-const { InsertAndFetchOperation } = require('./operations/InsertAndFetchOperation');
-const { UpdateAndFetchOperation } = require('./operations/UpdateAndFetchOperation');
-const { JoinRelatedOperation } = require('./operations/JoinRelatedOperation');
-const { OnBuildKnexOperation } = require('./operations/OnBuildKnexOperation');
-const { InsertGraphOperation } = require('./operations/InsertGraphOperation');
-const { UpsertGraphOperation } = require('./operations/UpsertGraphOperation');
-const { RunBeforeOperation } = require('./operations/RunBeforeOperation');
-const { RunAfterOperation } = require('./operations/RunAfterOperation');
-const { FindByIdOperation } = require('./operations/FindByIdOperation');
-const { FindByIdsOperation } = require('./operations/FindByIdsOperation');
-const { OnBuildOperation } = require('./operations/OnBuildOperation');
-const { OnErrorOperation } = require('./operations/OnErrorOperation');
-const { SelectOperation } = require('./operations/select/SelectOperation');
-const { EagerOperation } = require('./operations/eager/EagerOperation');
-const { RangeOperation } = require('./operations/RangeOperation');
-const { FirstOperation } = require('./operations/FirstOperation');
-const { FromOperation } = require('./operations/FromOperation');
-const { KnexOperation } = require('./operations/KnexOperation');
-class QueryBuilder extends QueryBuilderBase {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryBuilder = void 0;
+const whereScopes_1 = require("./whereScopes");
+const db_errors_1 = require("db-errors");
+const RawBuilder_1 = require("./RawBuilder");
+const createModifier_1 = require("../utils/createModifier");
+const ValidationError_1 = require("../model/ValidationError");
+const objectUtils_1 = require("../utils/objectUtils");
+const RelationExpression_1 = require("./RelationExpression");
+const assert_1 = require("../utils/assert");
+const Selection_1 = require("./operations/select/Selection");
+const QueryBuilderContext_1 = require("./QueryBuilderContext");
+const QueryBuilderBase_1 = require("./QueryBuilderBase");
+const FindOperation_1 = require("./operations/FindOperation");
+const DeleteOperation_1 = require("./operations/DeleteOperation");
+const UpdateOperation_1 = require("./operations/UpdateOperation");
+const InsertOperation_1 = require("./operations/InsertOperation");
+const RelateOperation_1 = require("./operations/RelateOperation");
+const UnrelateOperation_1 = require("./operations/UnrelateOperation");
+const JoinEagerOperation_1 = require("./operations/eager/JoinEagerOperation");
+const NaiveEagerOperation_1 = require("./operations/eager/NaiveEagerOperation");
+const WhereInEagerOperation_1 = require("./operations/eager/WhereInEagerOperation");
+const InsertGraphAndFetchOperation_1 = require("./operations/InsertGraphAndFetchOperation");
+const UpsertGraphAndFetchOperation_1 = require("./operations/UpsertGraphAndFetchOperation");
+const InsertAndFetchOperation_1 = require("./operations/InsertAndFetchOperation");
+const UpdateAndFetchOperation_1 = require("./operations/UpdateAndFetchOperation");
+const JoinRelatedOperation_1 = require("./operations/JoinRelatedOperation");
+const OnBuildKnexOperation_1 = require("./operations/OnBuildKnexOperation");
+const InsertGraphOperation_1 = require("./operations/InsertGraphOperation");
+const UpsertGraphOperation_1 = require("./operations/UpsertGraphOperation");
+const RunBeforeOperation_1 = require("./operations/RunBeforeOperation");
+const RunAfterOperation_1 = require("./operations/RunAfterOperation");
+const FindByIdOperation_1 = require("./operations/FindByIdOperation");
+const FindByIdsOperation_1 = require("./operations/FindByIdsOperation");
+const OnBuildOperation_1 = require("./operations/OnBuildOperation");
+const OnErrorOperation_1 = require("./operations/OnErrorOperation");
+const SelectOperation_1 = require("./operations/select/SelectOperation");
+const EagerOperation_1 = require("./operations/eager/EagerOperation");
+const RangeOperation_1 = require("./operations/RangeOperation");
+const FirstOperation_1 = require("./operations/FirstOperation");
+const FromOperation_1 = require("./operations/FromOperation");
+const KnexOperation_1 = require("./operations/KnexOperation");
+class QueryBuilder extends QueryBuilderBase_1.QueryBuilderBase {
     static init(self, modelClass) {
         super.init(self, modelClass);
         self._resultModelClass = null;
@@ -60,10 +62,10 @@ class QueryBuilder extends QueryBuilderBase {
         self._deleteOperationFactory = deleteOperationFactory;
     }
     static get QueryBuilderContext() {
-        return QueryBuilderContext;
+        return QueryBuilderContext_1.QueryBuilderContext;
     }
     static parseRelationExpression(expr) {
-        return RelationExpression.create(expr).toPojo();
+        return RelationExpression_1.RelationExpression.create(expr).toPojo();
     }
     tableName(newTableName) {
         return this.tableNameFor(this.modelClass().getTableName(), newTableName);
@@ -100,7 +102,7 @@ class QueryBuilder extends QueryBuilderBase {
         if (!modifier) {
             return this;
         }
-        modifier = createModifier({
+        modifier = (0, createModifier_1.createModifier)({
             modifier,
             modelClass: this.modelClass(),
             modifiers: this._modifiers,
@@ -165,7 +167,7 @@ class QueryBuilder extends QueryBuilderBase {
         return this;
     }
     allowGraph(exp) {
-        const currentExpr = this._allowedGraphExpression || RelationExpression.create();
+        const currentExpr = this._allowedGraphExpression || RelationExpression_1.RelationExpression.create();
         this._allowedGraphExpression = currentExpr.merge(parseRelationExpression(this.modelClass(), exp));
         checkEager(this);
         return this;
@@ -174,7 +176,7 @@ class QueryBuilder extends QueryBuilderBase {
         return this._allowedGraphExpression;
     }
     graphExpressionObject() {
-        const eagerOp = this.findOperation(EagerOperation);
+        const eagerOp = this.findOperation(EagerOperation_1.EagerOperation);
         if (eagerOp && !eagerOp.expression.isEmpty) {
             return eagerOp.expression.toPojo();
         }
@@ -183,7 +185,7 @@ class QueryBuilder extends QueryBuilderBase {
         }
     }
     graphModifiersAtPath() {
-        const eagerOp = this.findOperation(EagerOperation);
+        const eagerOp = this.findOperation(EagerOperation_1.EagerOperation);
         if (eagerOp && !eagerOp.expression.isEmpty) {
             return eagerOp.modifiersAtPath.map((it) => Object.assign({}, it));
         }
@@ -224,29 +226,29 @@ class QueryBuilder extends QueryBuilderBase {
             this.isUnrelate());
     }
     isInsert() {
-        return this.has(InsertOperation);
+        return this.has(InsertOperation_1.InsertOperation);
     }
     isUpdate() {
-        return this.has(UpdateOperation);
+        return this.has(UpdateOperation_1.UpdateOperation);
     }
     isDelete() {
-        return this.has(DeleteOperation);
+        return this.has(DeleteOperation_1.DeleteOperation);
     }
     isRelate() {
-        return this.has(RelateOperation);
+        return this.has(RelateOperation_1.RelateOperation);
     }
     isUnrelate() {
-        return this.has(UnrelateOperation);
+        return this.has(UnrelateOperation_1.UnrelateOperation);
     }
     hasWheres() {
         const queryWithoutGraph = this.clone().clearWithGraph();
-        return prebuildQuery(queryWithoutGraph).has(QueryBuilderBase.WhereSelector);
+        return prebuildQuery(queryWithoutGraph).has(QueryBuilderBase_1.QueryBuilderBase.WhereSelector);
     }
     hasSelects() {
-        return this.has(QueryBuilderBase.SelectSelector);
+        return this.has(QueryBuilderBase_1.QueryBuilderBase.SelectSelector);
     }
     hasWithGraph() {
-        const eagerOp = this.findOperation(EagerOperation);
+        const eagerOp = this.findOperation(EagerOperation_1.EagerOperation);
         return !!eagerOp && !eagerOp.expression.isEmpty;
     }
     isSelectAll() {
@@ -256,7 +258,9 @@ class QueryBuilder extends QueryBuilderBase {
         const tableRef = this.tableRef();
         const tableName = this.tableName();
         return this.everyOperation((op) => {
-            if (op.constructor === SelectOperation) {
+            // TypeScript narrows `op` to `never` when its constructor is compared with
+            // a subclass, hence `as unknown` and the casts in the branches.
+            if (op.constructor === SelectOperation_1.SelectOperation) {
                 // SelectOperations with zero selections are the ones that only have
                 // raw items or other non-trivial selections.
                 return (op.selections.length > 0 &&
@@ -264,10 +268,10 @@ class QueryBuilder extends QueryBuilderBase {
                         return (!select.table || select.table === tableRef) && select.column === '*';
                     }));
             }
-            else if (op.constructor === FromOperation) {
+            else if (op.constructor === FromOperation_1.FromOperation) {
                 return op.table === tableName;
             }
-            else if (op.name === 'as' || op.is(FindOperation) || op.is(OnErrorOperation)) {
+            else if (op.name === 'as' || op.is(FindOperation_1.FindOperation) || op.is(OnErrorOperation_1.OnErrorOperation)) {
                 return true;
             }
             else {
@@ -306,11 +310,11 @@ class QueryBuilder extends QueryBuilderBase {
         return builder;
     }
     clearWithGraph() {
-        this.clear(EagerOperation);
+        this.clear(EagerOperation_1.EagerOperation);
         return this;
     }
     clearWithGraphFetched() {
-        this.clear(WhereInEagerOperation);
+        this.clear(WhereInEagerOperation_1.WhereInEagerOperation);
         return this;
     }
     clearAllowGraph() {
@@ -348,7 +352,10 @@ class QueryBuilder extends QueryBuilderBase {
     async resultSize() {
         const knex = this.knex();
         const builder = this.clone().clear(/orderBy|offset|limit/);
-        const countQuery = knex.count('* as count').from((knexBuilder) => {
+        // knex's types don't accept this `from()` callback or `debug()` without an argument.
+        const countQuery = knex
+            .count('* as count')
+            .from((knexBuilder) => {
             builder.toKnexQuery(knexBuilder).as('temp');
         });
         if (this.internalOptions().debug) {
@@ -361,6 +368,7 @@ class QueryBuilder extends QueryBuilderBase {
         const prebuiltQuery = prebuildQuery(this.clone());
         return buildKnexQuery(prebuiltQuery, knexBuilder);
     }
+    // Resolves to whatever the operations produce: models, rows, counts...
     async execute() {
         // Take a clone so that we don't modify this instance during execution.
         const builder = this.clone();
@@ -390,7 +398,8 @@ class QueryBuilder extends QueryBuilderBase {
         let noSelectStatements = true;
         let selectionInstance = null;
         this.forEachOperation(true, (op) => {
-            if (op.constructor === SelectOperation) {
+            // See `isSelectAll()` for the casts.
+            if (op.constructor === SelectOperation_1.SelectOperation) {
                 selectionInstance = op.findSelection(this, selection);
                 noSelectStatements = false;
                 if (selectionInstance) {
@@ -402,8 +411,8 @@ class QueryBuilder extends QueryBuilderBase {
             return selectionInstance;
         }
         if (noSelectStatements && !explicit) {
-            const selectAll = new Selection(this.tableRef(), '*');
-            if (Selection.doesSelect(this, selectAll, selection)) {
+            const selectAll = new Selection_1.Selection(this.tableRef(), '*');
+            if (Selection_1.Selection.doesSelect(this, selectAll, selection)) {
                 return selectAll;
             }
             else {
@@ -417,7 +426,8 @@ class QueryBuilder extends QueryBuilderBase {
     findAllSelections() {
         let allSelections = [];
         this.forEachOperation(true, (op) => {
-            if (op.constructor === SelectOperation) {
+            // See `isSelectAll()` for the casts.
+            if (op.constructor === SelectOperation_1.SelectOperation) {
                 allSelections = allSelections.concat(op.selections);
             }
         });
@@ -427,7 +437,7 @@ class QueryBuilder extends QueryBuilderBase {
         return this.findSelection(selection, explicit) !== null;
     }
     hasSelectionAs(selection, alias, explicit) {
-        selection = Selection.create(selection);
+        selection = Selection_1.Selection.create(selection);
         const foundSelection = this.findSelection(selection, explicit);
         if (foundSelection === null) {
             return false;
@@ -459,7 +469,8 @@ class QueryBuilder extends QueryBuilderBase {
         table = table || this.tableName();
         const knex = this.knex();
         const tableParts = table.split('.');
-        const columnInfoQuery = knex(last(tableParts)).columnInfo();
+        // knex's types make `columnInfo()` a promise, but it's the query builder.
+        const columnInfoQuery = knex((0, objectUtils_1.last)(tableParts)).columnInfo();
         const schema = this.internalOptions().schema;
         if (schema) {
             columnInfoQuery.withSchema(schema);
@@ -478,7 +489,7 @@ class QueryBuilder extends QueryBuilderBase {
             if (!builder.has(/withSchema/)) {
                 // Need to push this operation to the front because knex doesn't use the
                 // schema for operations called before `withSchema`.
-                builder.addOperationToFront(new KnexOperation('withSchema'), [schema]);
+                builder.addOperationToFront(new KnexOperation_1.KnexOperation('withSchema'), [schema]);
             }
         });
         return this;
@@ -486,7 +497,7 @@ class QueryBuilder extends QueryBuilderBase {
     debug /* istanbul ignore next */() {
         this.internalOptions().debug = true;
         this.internalContext().onBuild.push((builder) => {
-            builder.addOperation(new KnexOperation('debug'), []);
+            builder.addOperation(new KnexOperation_1.KnexOperation('debug'), []);
         });
         return this;
     }
@@ -499,7 +510,7 @@ class QueryBuilder extends QueryBuilderBase {
     insertAndFetch(modelsOrObjects) {
         return writeOperation(this, () => {
             const insertOperation = this._insertOperationFactory(this);
-            const insertAndFetchOperation = new InsertAndFetchOperation('insertAndFetch', {
+            const insertAndFetchOperation = new InsertAndFetchOperation_1.InsertAndFetchOperation('insertAndFetch', {
                 delegate: insertOperation,
             });
             this.addOperation(insertAndFetchOperation, [modelsOrObjects]);
@@ -508,7 +519,7 @@ class QueryBuilder extends QueryBuilderBase {
     insertGraph(modelsOrObjects, opt) {
         return writeOperation(this, () => {
             const insertOperation = this._insertOperationFactory(this);
-            const insertGraphOperation = new InsertGraphOperation('insertGraph', {
+            const insertGraphOperation = new InsertGraphOperation_1.InsertGraphOperation('insertGraph', {
                 delegate: insertOperation,
                 opt,
             });
@@ -518,11 +529,11 @@ class QueryBuilder extends QueryBuilderBase {
     insertGraphAndFetch(modelsOrObjects, opt) {
         return writeOperation(this, () => {
             const insertOperation = this._insertOperationFactory(this);
-            const insertGraphOperation = new InsertGraphOperation('insertGraph', {
+            const insertGraphOperation = new InsertGraphOperation_1.InsertGraphOperation('insertGraph', {
                 delegate: insertOperation,
                 opt,
             });
-            const insertGraphAndFetchOperation = new InsertGraphAndFetchOperation('insertGraphAndFetch', {
+            const insertGraphAndFetchOperation = new InsertGraphAndFetchOperation_1.InsertGraphAndFetchOperation('insertGraphAndFetch', {
                 delegate: insertGraphOperation,
             });
             return this.addOperation(insertGraphAndFetchOperation, [modelsOrObjects]);
@@ -537,22 +548,26 @@ class QueryBuilder extends QueryBuilderBase {
     updateAndFetch(modelOrObject) {
         return writeOperation(this, () => {
             const updateOperation = this._updateOperationFactory(this);
+            // Only instance operations have `instance`, and this throws for the others.
             if (!(updateOperation.instance instanceof this.modelClass())) {
                 throw new Error('updateAndFetch can only be called for instance operations');
             }
-            const updateAndFetch = new UpdateAndFetchOperation('updateAndFetch', {
+            const updateAndFetch = new UpdateAndFetchOperation_1.UpdateAndFetchOperation('updateAndFetch', {
                 delegate: updateOperation,
             });
             // patchOperation is an instance update operation that already adds the
             // required "where id = $" clause.
             updateAndFetch.skipIdWhere = true;
-            this.addOperation(updateAndFetch, [updateOperation.instance.$id(), modelOrObject]);
+            this.addOperation(updateAndFetch, [
+                updateOperation.instance.$id(),
+                modelOrObject,
+            ]);
         });
     }
     updateAndFetchById(id, modelOrObject) {
         return writeOperation(this, () => {
             const updateOperation = this._updateOperationFactory(this);
-            const updateAndFetch = new UpdateAndFetchOperation('updateAndFetch', {
+            const updateAndFetch = new UpdateAndFetchOperation_1.UpdateAndFetchOperation('updateAndFetch', {
                 delegate: updateOperation,
             });
             this.addOperation(updateAndFetch, [id, modelOrObject]);
@@ -560,7 +575,7 @@ class QueryBuilder extends QueryBuilderBase {
     }
     upsertGraph(modelsOrObjects, upsertOptions) {
         return writeOperation(this, () => {
-            const upsertGraphOperation = new UpsertGraphOperation('upsertGraph', {
+            const upsertGraphOperation = new UpsertGraphOperation_1.UpsertGraphOperation('upsertGraph', {
                 upsertOptions,
             });
             this.addOperation(upsertGraphOperation, [modelsOrObjects]);
@@ -568,10 +583,10 @@ class QueryBuilder extends QueryBuilderBase {
     }
     upsertGraphAndFetch(modelsOrObjects, upsertOptions) {
         return writeOperation(this, () => {
-            const upsertGraphOperation = new UpsertGraphOperation('upsertGraph', {
+            const upsertGraphOperation = new UpsertGraphOperation_1.UpsertGraphOperation('upsertGraph', {
                 upsertOptions,
             });
-            const upsertGraphAndFetchOperation = new UpsertGraphAndFetchOperation('upsertGraphAndFetch', {
+            const upsertGraphAndFetchOperation = new UpsertGraphAndFetchOperation_1.UpsertGraphAndFetchOperation('upsertGraphAndFetch', {
                 delegate: upsertGraphOperation,
             });
             return this.addOperation(upsertGraphAndFetchOperation, [modelsOrObjects]);
@@ -586,22 +601,26 @@ class QueryBuilder extends QueryBuilderBase {
     patchAndFetch(modelOrObject) {
         return writeOperation(this, () => {
             const patchOperation = this._patchOperationFactory(this);
+            // Only instance operations have `instance`, and this throws for the others.
             if (!(patchOperation.instance instanceof this.modelClass())) {
                 throw new Error('patchAndFetch can only be called for instance operations');
             }
-            const patchAndFetch = new UpdateAndFetchOperation('patchAndFetch', {
+            const patchAndFetch = new UpdateAndFetchOperation_1.UpdateAndFetchOperation('patchAndFetch', {
                 delegate: patchOperation,
             });
             // patchOperation is an instance update operation that already adds the
             // required "where id = $" clause.
             patchAndFetch.skipIdWhere = true;
-            this.addOperation(patchAndFetch, [patchOperation.instance.$id(), modelOrObject]);
+            this.addOperation(patchAndFetch, [
+                patchOperation.instance.$id(),
+                modelOrObject,
+            ]);
         });
     }
     patchAndFetchById(id, modelOrObject) {
         return writeOperation(this, () => {
             const patchOperation = this._patchOperationFactory(this);
-            const patchAndFetch = new UpdateAndFetchOperation('patchAndFetch', {
+            const patchAndFetch = new UpdateAndFetchOperation_1.UpdateAndFetchOperation('patchAndFetch', {
                 delegate: patchOperation,
             });
             this.addOperation(patchAndFetch, [id, modelOrObject]);
@@ -637,23 +656,23 @@ class QueryBuilder extends QueryBuilderBase {
     increment(propertyName, howMuch) {
         const columnName = this.modelClass().propertyNameToColumnName(propertyName);
         return this.patch({
-            [columnName]: raw('?? + ?', [columnName, howMuch]),
+            [columnName]: (0, RawBuilder_1.raw)('?? + ?', [columnName, howMuch]),
         });
     }
     decrement(propertyName, howMuch) {
         const columnName = this.modelClass().propertyNameToColumnName(propertyName);
         return this.patch({
-            [columnName]: raw('?? - ?', [columnName, howMuch]),
+            [columnName]: (0, RawBuilder_1.raw)('?? - ?', [columnName, howMuch]),
         });
     }
     findOne(...args) {
         return this.where.apply(this, args).first();
     }
     range(...args) {
-        return this.clear(RangeOperation).addOperation(new RangeOperation('range'), args);
+        return this.clear(RangeOperation_1.RangeOperation).addOperation(new RangeOperation_1.RangeOperation('range'), args);
     }
     first(...args) {
-        return this.addOperation(new FirstOperation('first'), args);
+        return this.addOperation(new FirstOperation_1.FirstOperation('first'), args);
     }
     joinRelated(expression, options) {
         ensureJoinRelatedOperation(this, 'innerJoin').addCall({
@@ -712,43 +731,43 @@ class QueryBuilder extends QueryBuilderBase {
         return this;
     }
     deleteById(id) {
-        return withWhereScope(this, () => this.findById(id))
+        return (0, whereScopes_1.withWhereScope)(this, () => this.findById(id))
             .delete()
             .runBefore((_, builder) => {
             if (!builder.internalOptions().skipUndefined) {
-                assertIdNotUndefined(id, `undefined was passed to deleteById`);
+                (0, assert_1.assertIdNotUndefined)(id, `undefined was passed to deleteById`);
             }
         });
     }
     findById(...args) {
-        return this.addOperation(new FindByIdOperation('findById'), args).first();
+        return this.addOperation(new FindByIdOperation_1.FindByIdOperation('findById'), args).first();
     }
     findByIds(...args) {
-        return this.addOperation(new FindByIdsOperation('findByIds'), args);
+        return this.addOperation(new FindByIdsOperation_1.FindByIdsOperation('findByIds'), args);
     }
     runBefore(...args) {
-        return this.addOperation(new RunBeforeOperation('runBefore'), args);
+        return this.addOperation(new RunBeforeOperation_1.RunBeforeOperation('runBefore'), args);
     }
     onBuild(...args) {
-        return this.addOperation(new OnBuildOperation('onBuild'), args);
+        return this.addOperation(new OnBuildOperation_1.OnBuildOperation('onBuild'), args);
     }
     onBuildKnex(...args) {
-        return this.addOperation(new OnBuildKnexOperation('onBuildKnex'), args);
+        return this.addOperation(new OnBuildKnexOperation_1.OnBuildKnexOperation('onBuildKnex'), args);
     }
     runAfter(...args) {
-        return this.addOperation(new RunAfterOperation('runAfter'), args);
+        return this.addOperation(new RunAfterOperation_1.RunAfterOperation('runAfter'), args);
     }
     onError(...args) {
-        return this.addOperation(new OnErrorOperation('onError'), args);
+        return this.addOperation(new OnErrorOperation_1.OnErrorOperation('onError'), args);
     }
     from(...args) {
-        return this.addOperation(new FromOperation('from'), args);
+        return this.addOperation(new FromOperation_1.FromOperation('from'), args);
     }
     updateFrom(...args) {
-        return this.addOperation(new KnexOperation('updateFrom'), args);
+        return this.addOperation(new KnexOperation_1.KnexOperation('updateFrom'), args);
     }
     table(...args) {
-        return this.addOperation(new FromOperation('table'), args);
+        return this.addOperation(new FromOperation_1.FromOperation('table'), args);
     }
     for(relatedQueryFor) {
         if (arguments.length === 0) {
@@ -770,6 +789,7 @@ class QueryBuilder extends QueryBuilderBase {
         return this;
     }
 }
+exports.QueryBuilder = QueryBuilder;
 Object.defineProperties(QueryBuilder.prototype, {
     isObjectionQueryBuilder: {
         enumerable: false,
@@ -778,16 +798,17 @@ Object.defineProperties(QueryBuilder.prototype, {
     },
 });
 function isWriteOperation(op) {
-    return (op.is(InsertOperation) ||
-        op.is(UpdateOperation) ||
-        op.is(DeleteOperation) ||
-        op.is(RelateOperation) ||
-        op.is(UnrelateOperation));
+    return (op.is(InsertOperation_1.InsertOperation) ||
+        op.is(UpdateOperation_1.UpdateOperation) ||
+        op.is(DeleteOperation_1.DeleteOperation) ||
+        op.is(RelateOperation_1.RelateOperation) ||
+        op.is(UnrelateOperation_1.UnrelateOperation));
 }
+// Returns the eager operation, whose class depends on the algorithm.
 function ensureEagerOperation(builder, algorithm = null) {
     const modelClass = builder.modelClass();
     const defaultGraphOptions = modelClass.getDefaultGraphOptions();
-    const eagerOp = builder.findOperation(EagerOperation);
+    const eagerOp = builder.findOperation(EagerOperation_1.EagerOperation);
     if (algorithm) {
         const EagerOperationClass = getOperationClassForEagerAlgorithm(builder, algorithm);
         if (eagerOp instanceof EagerOperationClass) {
@@ -800,7 +821,7 @@ function ensureEagerOperation(builder, algorithm = null) {
             if (eagerOp) {
                 newEagerOp.cloneFrom(eagerOp);
             }
-            builder.clear(EagerOperation);
+            builder.clear(EagerOperation_1.EagerOperation);
             builder.addOperation(newEagerOp);
             return newEagerOp;
         }
@@ -830,36 +851,36 @@ function getNaiveEagerAlgorithm(builder) {
 }
 function getOperationClassForEagerAlgorithm(builder, algorithm) {
     if (algorithm === getJoinEagerAlgorithm(builder)) {
-        return JoinEagerOperation;
+        return JoinEagerOperation_1.JoinEagerOperation;
     }
     else if (algorithm === getNaiveEagerAlgorithm(builder)) {
-        return NaiveEagerOperation;
+        return NaiveEagerOperation_1.NaiveEagerOperation;
     }
     else {
-        return WhereInEagerOperation;
+        return WhereInEagerOperation_1.WhereInEagerOperation;
     }
 }
 function parseRelationExpression(modelClass, exp) {
     try {
-        return RelationExpression.create(exp);
+        return RelationExpression_1.RelationExpression.create(exp);
     }
     catch (err) {
-        if (err instanceof DuplicateRelationError) {
+        if (err instanceof RelationExpression_1.DuplicateRelationError) {
             throw modelClass.createValidationError({
-                type: ValidationErrorType.RelationExpression,
+                type: ValidationError_1.ValidationErrorType.RelationExpression,
                 message: `Duplicate relation name "${err.relationName}" in relation expression "${exp}". For example, use "${err.relationName}.[foo, bar]" instead of "[${err.relationName}.foo, ${err.relationName}.bar]".`,
             });
         }
         else {
             throw modelClass.createValidationError({
-                type: ValidationErrorType.RelationExpression,
+                type: ValidationError_1.ValidationErrorType.RelationExpression,
                 message: `Invalid relation expression "${exp}"`,
             });
         }
     }
 }
 function checkEager(builder) {
-    const eagerOp = builder.findOperation(EagerOperation);
+    const eagerOp = builder.findOperation(EagerOperation_1.EagerOperation);
     if (!eagerOp) {
         return;
     }
@@ -868,7 +889,7 @@ function checkEager(builder) {
     if (expr.numChildren > 0 && allowedExpr && !allowedExpr.isSubExpression(expr)) {
         const modelClass = builder.modelClass();
         builder.reject(modelClass.createValidationError({
-            type: ValidationErrorType.UnallowedRelation,
+            type: ValidationError_1.ValidationErrorType.UnallowedRelation,
             message: 'eager expression not allowed',
         }));
     }
@@ -941,7 +962,7 @@ function handleExecuteError(builder, err) {
     if (err instanceof ReturnImmediatelyException) {
         return Promise.resolve(err.value);
     }
-    let promise = Promise.reject(wrapError(err));
+    let promise = Promise.reject((0, db_errors_1.wrapError)(err));
     builder.forEachOperation(true, (op) => {
         if (op.hasOnError()) {
             promise = promise.catch((err) => builder.callAsyncOperationMethod(op, 'onError', [builder, err]));
@@ -966,9 +987,10 @@ function chainOperationHooks(promise, builder, hookName) {
 }
 function ensureJoinRelatedOperation(builder, joinOperation) {
     const opName = joinOperation + 'Relation';
+    // The operation named `opName` is the join related operation added below.
     let op = builder.findOperation(opName);
     if (!op) {
-        op = new JoinRelatedOperation(opName, { joinOperation });
+        op = new JoinRelatedOperation_1.JoinRelatedOperation(opName, { joinOperation });
         builder.addOperation(op);
     }
     return op;
@@ -979,6 +1001,7 @@ function prebuildQuery(builder) {
     builder = callOnBuildHooks(builder);
     const queryExecutorOperation = findQueryExecutorOperation(builder);
     if (queryExecutorOperation) {
+        // The base hook returns nothing, but a query executor returns the query to run.
         return prebuildQuery(queryExecutorOperation.queryExecutor(builder));
     }
     else {
@@ -997,14 +1020,14 @@ function addImplicitOperations(builder) {
     return builder;
 }
 function addFindOperation(builder) {
-    if (!builder.has(FindOperation)) {
+    if (!builder.has(FindOperation_1.FindOperation)) {
         const operation = builder._findOperationFactory(builder);
         builder.addOperationToFront(operation, []);
     }
 }
 function moveEagerOperationToEnd(builder) {
-    const eagerOp = builder.findOperation(EagerOperation);
-    builder.clear(EagerOperation);
+    const eagerOp = builder.findOperation(EagerOperation_1.EagerOperation);
+    builder.clear(EagerOperation_1.EagerOperation);
     builder.addOperation(eagerOp);
 }
 function callOnBuildHooks(builder) {
@@ -1013,8 +1036,9 @@ function callOnBuildHooks(builder) {
     builder.executeOnBuild();
     return builder;
 }
+// `func` is a function or an array of functions and arrays.
 function callOnBuildFuncs(builder, func) {
-    if (isFunction(func)) {
+    if ((0, objectUtils_1.isFunction)(func)) {
         func.call(builder, builder);
     }
     else if (Array.isArray(func)) {
@@ -1023,7 +1047,7 @@ function callOnBuildFuncs(builder, func) {
 }
 function buildKnexQuery(builder, knexBuilder = builder.knex().queryBuilder()) {
     knexBuilder = builder.executeOnBuildKnex(knexBuilder);
-    const fromOperation = builder.findLastOperation(QueryBuilderBase.FromSelector);
+    const fromOperation = builder.findLastOperation(QueryBuilderBase_1.QueryBuilderBase.FromSelector);
     if (!builder.isPartial()) {
         // Set the table only if it hasn't been explicitly set yet.
         if (!fromOperation) {
@@ -1031,7 +1055,9 @@ function buildKnexQuery(builder, knexBuilder = builder.knex().queryBuilder()) {
         }
         // Only add `table.*` select if there are no explicit selects
         // and `from` is a table name and not a subquery.
-        if (!builder.hasSelects() && (!fromOperation || fromOperation.table)) {
+        // `fromRaw()` and `into()` aren't `FromOperation`s and have no `table`.
+        if (!builder.hasSelects() &&
+            (!fromOperation || fromOperation.table)) {
             knexBuilder = setDefaultSelect(builder, knexBuilder);
         }
     }
@@ -1051,10 +1077,11 @@ function setDefaultSelect(builder, knexBuilder) {
     const tableRef = builder.tableRef();
     return knexBuilder.select(`${tableRef}.*`);
 }
+// `func` is a function or an array of functions and arrays.
 async function chainHooks(promise, builder, func) {
     return promise.then((result) => {
         let promise = Promise.resolve(result);
-        if (isFunction(func)) {
+        if ((0, objectUtils_1.isFunction)(func)) {
             promise = promise.then((result) => {
                 const res = func.call(builder, result, builder);
                 handleReturnImmediatelyValue(builder);
@@ -1091,7 +1118,7 @@ function createModels(result, builder) {
     return result;
 }
 function shouldBeConvertedToModel(obj, modelClass) {
-    return isObject(obj) && !(obj instanceof modelClass);
+    return (0, objectUtils_1.isObject)(obj) && !(obj instanceof modelClass);
 }
 function writeOperation(builder, cb) {
     if (!builder.isFind()) {
@@ -1109,28 +1136,27 @@ function writeOperation(builder, cb) {
     }
 }
 function findOperationFactory() {
-    return new FindOperation('find');
+    return new FindOperation_1.FindOperation('find');
 }
 function insertOperationFactory() {
-    return new InsertOperation('insert');
+    return new InsertOperation_1.InsertOperation('insert');
 }
 function updateOperationFactory() {
-    return new UpdateOperation('update');
+    return new UpdateOperation_1.UpdateOperation('update');
 }
 function patchOperationFactory() {
-    return new UpdateOperation('patch', {
+    return new UpdateOperation_1.UpdateOperation('patch', {
         modelOptions: { patch: true },
     });
 }
 function relateOperationFactory() {
-    return new RelateOperation('relate', {});
+    // A plain query has no relation: the relation queries replace this factory.
+    return new RelateOperation_1.RelateOperation('relate', {});
 }
 function unrelateOperationFactory() {
-    return new UnrelateOperation('unrelate', {});
+    // A plain query has no relation: the relation queries replace this factory.
+    return new UnrelateOperation_1.UnrelateOperation('unrelate', {});
 }
 function deleteOperationFactory() {
-    return new DeleteOperation('delete');
+    return new DeleteOperation_1.DeleteOperation('delete');
 }
-module.exports = {
-    QueryBuilder,
-};