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

package/typings/objection/index.d.mts

@@ -0,0 +1,362 @@
+// Generated by scripts/generate-esm-typings.js from index.d.ts. Do not edit.
+//
+// The types of the ES module entry (lib/index.mjs).
+
+import objection from './index.js';
+
+export default objection;
+
+export import raw = objection.raw;
+export import val = objection.val;
+export import ref = objection.ref;
+export import fn = objection.fn;
+export import compose = objection.compose;
+export import mixin = objection.mixin;
+export import defineRelations = objection.defineRelations;
+export import BelongsToOneRelation = objection.BelongsToOneRelation;
+export import HasOneRelation = objection.HasOneRelation;
+export import HasManyRelation = objection.HasManyRelation;
+export import ManyToManyRelation = objection.ManyToManyRelation;
+export import HasOneThroughRelation = objection.HasOneThroughRelation;
+export import snakeCaseMappers = objection.snakeCaseMappers;
+export import knexSnakeCaseMappers = objection.knexSnakeCaseMappers;
+export import transaction = objection.transaction;
+export import initialize = objection.initialize;
+export import DBError = objection.DBError;
+export import DataError = objection.DataError;
+export import CheckViolationError = objection.CheckViolationError;
+export import UniqueViolationError = objection.UniqueViolationError;
+export import ConstraintViolationError = objection.ConstraintViolationError;
+export import ForeignKeyViolationError = objection.ForeignKeyViolationError;
+export import NotNullViolationError = objection.NotNullViolationError;
+export import RawBuilder = objection.RawBuilder;
+export import RawExpressionBuilder = objection.RawExpressionBuilder;
+export import RawFunction = objection.RawFunction;
+export import RawInterface = objection.RawInterface;
+export import ValueBuilder = objection.ValueBuilder;
+export import ValueFunction = objection.ValueFunction;
+export import ReferenceBuilder = objection.ReferenceBuilder;
+export import ReferenceFunction = objection.ReferenceFunction;
+export import RefColumnName = objection.RefColumnName;
+export import IsJsonType = objection.IsJsonType;
+export import JsonColumnName = objection.JsonColumnName;
+export import JsonFieldPath = objection.JsonFieldPath;
+export import RefExpression = objection.RefExpression;
+export import RefValue = objection.RefValue;
+export import FunctionBuilder = objection.FunctionBuilder;
+export import SqlFunctionShortcut = objection.SqlFunctionShortcut;
+export import AggregateFunctionShortcut = objection.AggregateFunctionShortcut;
+export import AggregateFunctionBuilder = objection.AggregateFunctionBuilder;
+export import WindowFunctionBuilder = objection.WindowFunctionBuilder;
+export import FnWindow = objection.FnWindow;
+export import CaseBuilder = objection.CaseBuilder;
+export import FnResult = objection.FnResult;
+export import SqlBoolean = objection.SqlBoolean;
+export import Typed = objection.Typed;
+export import CompareValue = objection.CompareValue;
+export import ExpressionMethods = objection.ExpressionMethods;
+export import FnNumeric = objection.FnNumeric;
+export import FnArg = objection.FnArg;
+export import FnJsonArg = objection.FnJsonArg;
+export import FnExpression = objection.FnExpression;
+export import FnOrderBy = objection.FnOrderBy;
+export import FnIntervalUnit = objection.FnIntervalUnit;
+export import FnTimestampUnit = objection.FnTimestampUnit;
+export import FunctionFunction = objection.FunctionFunction;
+export import ComposeFunction = objection.ComposeFunction;
+export import Plugin = objection.Plugin;
+export import MixinFunction = objection.MixinFunction;
+export import Aliasable = objection.Aliasable;
+export import Castable = objection.Castable;
+export import Raw = objection.Raw;
+export import Operator = objection.Operator;
+export import ColumnRef = objection.ColumnRef;
+export import TableRef = objection.TableRef;
+export import PrimitiveValue = objection.PrimitiveValue;
+export import Expression = objection.Expression;
+export import Id = objection.Id;
+export import CompositeId = objection.CompositeId;
+export import MaybeCompositeId = objection.MaybeCompositeId;
+export import ExpressionObject = objection.ExpressionObject;
+export import PrimitiveValueObject = objection.PrimitiveValueObject;
+export import CallbackVoid = objection.CallbackVoid;
+export import Identity = objection.Identity;
+export import AnyQueryBuilder = objection.AnyQueryBuilder;
+export import AnyModelConstructor = objection.AnyModelConstructor;
+export import ModifierFunction = objection.ModifierFunction;
+export import Modifier = objection.Modifier;
+export import OrderByDirection = objection.OrderByDirection;
+export import OrderByNulls = objection.OrderByNulls;
+export import Modifiers = objection.Modifiers;
+export import RelationExpression = objection.RelationExpression;
+export import CheckRelationExpression = objection.CheckRelationExpression;
+export import GraphErrors = objection.GraphErrors;
+export import NodeErrors = objection.NodeErrors;
+export import ModifierNameErrors = objection.ModifierNameErrors;
+export import RelationNameKeys = objection.RelationNameKeys;
+export import RelatedModel = objection.RelatedModel;
+export import ElementOrSelf = objection.ElementOrSelf;
+export import IsUncheckedModel = objection.IsUncheckedModel;
+export import Loaded = objection.Loaded;
+export import WithGraph = objection.WithGraph;
+export import WithChildren = objection.WithChildren;
+export import Replace = objection.Replace;
+export import Without = objection.Without;
+export import LoadedRelations = objection.LoadedRelations;
+export import MaybeLoadedRelations = objection.MaybeLoadedRelations;
+export import LoadedRelation = objection.LoadedRelation;
+export import RelationValue = objection.RelationValue;
+export import PreviousRow = objection.PreviousRow;
+export import LoadedNodeRow = objection.LoadedNodeRow;
+export import ApplyNodeModifiers = objection.ApplyNodeModifiers;
+export import ModifiedItem = objection.ModifiedItem;
+export import ReturnedItem = objection.ReturnedItem;
+export import MergeLoaded = objection.MergeLoaded;
+export import Only = objection.Only;
+export import LoadedKeys = objection.LoadedKeys;
+export import WithGraphQueryBuilder = objection.WithGraphQueryBuilder;
+export import StaticFetchGraphMethod = objection.StaticFetchGraphMethod;
+export import StaticFetchGraphQueryBuilder = objection.StaticFetchGraphQueryBuilder;
+export import FetchGraphQueryBuilder = objection.FetchGraphQueryBuilder;
+export import ItemQueryBuilder = objection.ItemQueryBuilder;
+export import ModifiedQueryBuilder = objection.ModifiedQueryBuilder;
+export import ItemType = objection.ItemType;
+export import NonFunctionPropertyNames = objection.NonFunctionPropertyNames;
+export import DataPropertyNames = objection.DataPropertyNames;
+export import Defined = objection.Defined;
+export import ModelObject = objection.ModelObject;
+export import PartialModelObject = objection.PartialModelObject;
+export import JsonFieldKey = objection.JsonFieldKey;
+export import CheckModelUpdate = objection.CheckModelUpdate;
+export import GraphParameters = objection.GraphParameters;
+export import PartialModelGraph = objection.PartialModelGraph;
+export import PartialModelGraphField = objection.PartialModelGraphField;
+export import ModelProps = objection.ModelProps;
+export import ModelDataKeys = objection.ModelDataKeys;
+export import ModelRelations = objection.ModelRelations;
+export import RelatedQueryBuilder = objection.RelatedQueryBuilder;
+export import ArrayRelatedQueryBuilder = objection.ArrayRelatedQueryBuilder;
+export import QueryBuilderType = objection.QueryBuilderType;
+export import ModelType = objection.ModelType;
+export import ResultType = objection.ResultType;
+export import IsAnyType = objection.IsAnyType;
+export import ResultItemOf = objection.ResultItemOf;
+export import IsSingleResult = objection.IsSingleResult;
+export import QueryBuilderState = objection.QueryBuilderState;
+export import QueryBuilderItemState = objection.QueryBuilderItemState;
+export import OpaqueItemState = objection.OpaqueItemState;
+export import CastItemState = objection.CastItemState;
+export import ModelRow = objection.ModelRow;
+export import RequiredRelationKeys = objection.RequiredRelationKeys;
+export import Row = objection.Row;
+export import RelationKeys = objection.RelationKeys;
+export import ModelLike = objection.ModelLike;
+export import MakeOpaque = objection.MakeOpaque;
+export import OpaqueQueryBuilder = objection.OpaqueQueryBuilder;
+export import RowQueryBuilder = objection.RowQueryBuilder;
+export import DefaultQueryBuilderState = objection.DefaultQueryBuilderState;
+export import RebindQueryBuilder = objection.RebindQueryBuilder;
+export import SingleQueryBuilder = objection.SingleQueryBuilder;
+export import MaybeSingleQueryBuilder = objection.MaybeSingleQueryBuilder;
+export import ArrayQueryBuilder = objection.ArrayQueryBuilder;
+export import NumberQueryBuilder = objection.NumberQueryBuilder;
+export import PageQueryBuilder = objection.PageQueryBuilder;
+export import RunAfterResult = objection.RunAfterResult;
+export import ReplaceResultItem = objection.ReplaceResultItem;
+export import ReplaceResultMember = objection.ReplaceResultMember;
+export import ModelClassQueryBuilder = objection.ModelClassQueryBuilder;
+export import InitialQueryBuilder = objection.InitialQueryBuilder;
+export import ForClassMethod = objection.ForClassMethod;
+export import FieldExpression = objection.FieldExpression;
+export import JsonObjectOrFieldExpression = objection.JsonObjectOrFieldExpression;
+export import Selection = objection.Selection;
+export import SelectMethod = objection.SelectMethod;
+export import AsMethod = objection.AsMethod;
+export import FromMethod = objection.FromMethod;
+export import FromRawMethod = objection.FromRawMethod;
+export import JsonExtraction = objection.JsonExtraction;
+export import JsonExtract = objection.JsonExtract;
+export import JsonSet = objection.JsonSet;
+export import JsonInsert = objection.JsonInsert;
+export import JsonRemove = objection.JsonRemove;
+export import WhereMethod = objection.WhereMethod;
+export import WhereRawMethod = objection.WhereRawMethod;
+export import WhereWrappedMethod = objection.WhereWrappedMethod;
+export import WhereExistsMethod = objection.WhereExistsMethod;
+export import WhereInMethod = objection.WhereInMethod;
+export import WhereBetweenMethod = objection.WhereBetweenMethod;
+export import WhereNullMethod = objection.WhereNullMethod;
+export import WhereColumnMethod = objection.WhereColumnMethod;
+export import WhereJsonObject = objection.WhereJsonObject;
+export import WhereJsonPath = objection.WhereJsonPath;
+export import WhereJsonMethod = objection.WhereJsonMethod;
+export import WhereFieldExpressionMethod = objection.WhereFieldExpressionMethod;
+export import WhereJsonExpressionMethod = objection.WhereJsonExpressionMethod;
+export import WhereJsonField = objection.WhereJsonField;
+export import WhereCompositeMethod = objection.WhereCompositeMethod;
+export import WhereInCompositeMethod = objection.WhereInCompositeMethod;
+export import QBOrCallback = objection.QBOrCallback;
+export import BaseSetOperations = objection.BaseSetOperations;
+export import SetOperationsMethod = objection.SetOperationsMethod;
+export import UnionMethod = objection.UnionMethod;
+export import WithMethod = objection.WithMethod;
+export import JoinRelatedOptions = objection.JoinRelatedOptions;
+export import JoinRelatedMethod = objection.JoinRelatedMethod;
+export import JoinMethod = objection.JoinMethod;
+export import CrossJoinMethod = objection.CrossJoinMethod;
+export import JoinValue = objection.JoinValue;
+export import JoinOnMethod = objection.JoinOnMethod;
+export import JoinOnValMethod = objection.JoinOnValMethod;
+export import JoinOnInMethod = objection.JoinOnInMethod;
+export import JoinOnNullMethod = objection.JoinOnNullMethod;
+export import JoinOnExistsMethod = objection.JoinOnExistsMethod;
+export import JoinOnBetweenMethod = objection.JoinOnBetweenMethod;
+export import JoinOnJsonPathEqualsMethod = objection.JoinOnJsonPathEqualsMethod;
+export import JoinBuilder = objection.JoinBuilder;
+export import JoinRawMethod = objection.JoinRawMethod;
+export import IncrementDecrementMethod = objection.IncrementDecrementMethod;
+export import AggregateMethod = objection.AggregateMethod;
+export import CountMethod = objection.CountMethod;
+export import GroupByMethod = objection.GroupByMethod;
+export import OrderByDescriptor = objection.OrderByDescriptor;
+export import ColumnRefOrOrderByDescriptor = objection.ColumnRefOrOrderByDescriptor;
+export import OrderByMethod = objection.OrderByMethod;
+export import OrderByRawMethod = objection.OrderByRawMethod;
+export import FirstMethod = objection.FirstMethod;
+export import ForIdValue = objection.ForIdValue;
+export import WithGraphMethod = objection.WithGraphMethod;
+export import GraphModel = objection.GraphModel;
+export import RelationsModel = objection.RelationsModel;
+export import AllowGraphMethod = objection.AllowGraphMethod;
+export import IdentityMethod = objection.IdentityMethod;
+export import OneArgMethod = objection.OneArgMethod;
+export import StringReturningMethod = objection.StringReturningMethod;
+export import BooleanReturningMethod = objection.BooleanReturningMethod;
+export import HasMethod = objection.HasMethod;
+export import ClearMethod = objection.ClearMethod;
+export import ColumnInfoMethod = objection.ColumnInfoMethod;
+export import TableRefForMethod = objection.TableRefForMethod;
+export import AliasForMethod = objection.AliasForMethod;
+export import ModelClassMethod = objection.ModelClassMethod;
+export import ReturningMethod = objection.ReturningMethod;
+export import TimeoutOptions = objection.TimeoutOptions;
+export import TimeoutMethod = objection.TimeoutMethod;
+export import Page = objection.Page;
+export import RunBeforeCallback = objection.RunBeforeCallback;
+export import RunBeforeMethod = objection.RunBeforeMethod;
+export import RunAfterCallback = objection.RunAfterCallback;
+export import RunAfterMethod = objection.RunAfterMethod;
+export import OnBuildMethod = objection.OnBuildMethod;
+export import OnBuildKnexCallback = objection.OnBuildKnexCallback;
+export import OnBuildKnexMethod = objection.OnBuildKnexMethod;
+export import OnErrorCallback = objection.OnErrorCallback;
+export import OnErrorMethod = objection.OnErrorMethod;
+export import InsertGraphOptions = objection.InsertGraphOptions;
+export import InsertGraphMethod = objection.InsertGraphMethod;
+export import UpsertGraphOptions = objection.UpsertGraphOptions;
+export import UpsertGraphMethod = objection.UpsertGraphMethod;
+export import GraphExpressionObjectMethod = objection.GraphExpressionObjectMethod;
+export import GraphOptions = objection.GraphOptions;
+export import ModifyGraphMethod = objection.ModifyGraphMethod;
+export import CheckGraphPath = objection.CheckGraphPath;
+export import GraphPathErrors = objection.GraphPathErrors;
+export import GraphPathStep = objection.GraphPathStep;
+export import ModelOfRow = objection.ModelOfRow;
+export import GraphPathQueryBuilder = objection.GraphPathQueryBuilder;
+export import GraphPathTarget = objection.GraphPathTarget;
+export import IsUnion = objection.IsUnion;
+export import ContextMethod = objection.ContextMethod;
+export import ClearContextMethod = objection.ClearContextMethod;
+export import ModifierArgs = objection.ModifierArgs;
+export import CheckModifierModel = objection.CheckModifierModel;
+export import ModifyMethod = objection.ModifyMethod;
+export import ChecksModifierNames = objection.ChecksModifierNames;
+export import QueryModifiers = objection.QueryModifiers;
+export import ModifierNameOf = objection.ModifierNameOf;
+export import NamedModifierArgs = objection.NamedModifierArgs;
+export import CheckModifierName = objection.CheckModifierName;
+export import CheckModifierList = objection.CheckModifierList;
+export import ModifiersMethod = objection.ModifiersMethod;
+export import Pojo = objection.Pojo;
+export import CatchablePromiseLike = objection.CatchablePromiseLike;
+export import QueryBuilder = objection.QueryBuilder;
+export import X = objection.X;
+export import FetchGraphOptions = objection.FetchGraphOptions;
+export import TraverserFunction = objection.TraverserFunction;
+export import ArrayQueryBuilderThunk = objection.ArrayQueryBuilderThunk;
+export import CancelQueryThunk = objection.CancelQueryThunk;
+export import StaticHookArguments = objection.StaticHookArguments;
+export import Transaction = objection.Transaction;
+export import TransactionOrKnex = objection.TransactionOrKnex;
+export import RelationMappings = objection.RelationMappings;
+export import RelationMappingsThunk = objection.RelationMappingsThunk;
+export import ModelClassFactory = objection.ModelClassFactory;
+export import ModelClassSpecifier = objection.ModelClassSpecifier;
+export import RelationMappingHook = objection.RelationMappingHook;
+export import StringOrReferenceBuilder = objection.StringOrReferenceBuilder;
+export import RelationMappingColumnRef = objection.RelationMappingColumnRef;
+export import RelationMapping = objection.RelationMapping;
+export import RelationJoin = objection.RelationJoin;
+export import RelationThrough = objection.RelationThrough;
+export import RelationCardinality = objection.RelationCardinality;
+export import RelationType = objection.RelationType;
+export import RelationMappingsOf = objection.RelationMappingsOf;
+export import InferredRelationMappings = objection.InferredRelationMappings;
+export import RelatedModelClassOf = objection.RelatedModelClassOf;
+export import RelatedModelOf = objection.RelatedModelOf;
+export import RelationExtraColumns = objection.RelationExtraColumns;
+export import RelationExtraProps = objection.RelationExtraProps;
+export import WithRelationExtraProps = objection.WithRelationExtraProps;
+export import RelationPropertyType = objection.RelationPropertyType;
+export import RelationsOf = objection.RelationsOf;
+export import InferredRelationProps = objection.InferredRelationProps;
+export import ModelInstance = objection.ModelInstance;
+export import WithModelModifiers = objection.WithModelModifiers;
+export import ModelModifiers = objection.ModelModifiers;
+export import ModifiersOf = objection.ModifiersOf;
+export import KnownModifiers = objection.KnownModifiers;
+export import RelationNamesOf = objection.RelationNamesOf;
+export import RelationQueryBuilder = objection.RelationQueryBuilder;
+export import UnknownRelationName = objection.UnknownRelationName;
+export import RelationMappingsDefinition = objection.RelationMappingsDefinition;
+export import DefineRelationsFunction = objection.DefineRelationsFunction;
+export import Relation = objection.Relation;
+export import RelationProperty = objection.RelationProperty;
+export import Relations = objection.Relations;
+export import QueryContext = objection.QueryContext;
+export import ModelOptions = objection.ModelOptions;
+export import CloneOptions = objection.CloneOptions;
+export import ToJsonOptions = objection.ToJsonOptions;
+export import ValidatorContext = objection.ValidatorContext;
+export import ValidatorArgs = objection.ValidatorArgs;
+export import Validator = objection.Validator;
+export import AjvConfig = objection.AjvConfig;
+export import AjvValidator = objection.AjvValidator;
+export import SnakeCaseMappersOptions = objection.SnakeCaseMappersOptions;
+export import ColumnNameMappers = objection.ColumnNameMappers;
+export import SnakeCaseMappersFactory = objection.SnakeCaseMappersFactory;
+export import KnexMappers = objection.KnexMappers;
+export import KnexSnakeCaseMappersFactory = objection.KnexSnakeCaseMappersFactory;
+export import ValidationErrorType = objection.ValidationErrorType;
+export import ValidationError = objection.ValidationError;
+export import ValidationErrorItem = objection.ValidationErrorItem;
+export import ErrorHash = objection.ErrorHash;
+export import CreateValidationErrorArgs = objection.CreateValidationErrorArgs;
+export import NotFoundError = objection.NotFoundError;
+export import CreateNotFoundErrorArgs = objection.CreateNotFoundErrorArgs;
+export import TableMetadata = objection.TableMetadata;
+export import TableMetadataOptions = objection.TableMetadataOptions;
+export import FetchTableMetadataOptions = objection.FetchTableMetadataOptions;
+export import Constructor = objection.Constructor;
+export import PrototypeType = objection.PrototypeType;
+export import ConstructorFunctionType = objection.ConstructorFunctionType;
+export import ConstructorType = objection.ConstructorType;
+export import ModelConstructor = objection.ModelConstructor;
+export import ModelClass = objection.ModelClass;
+export import Model = objection.Model;
+export import JSONSchemaTypeName = objection.JSONSchemaTypeName;
+export import JSONSchemaType = objection.JSONSchemaType;
+export import JSONSchemaArray = objection.JSONSchemaArray;
+export import JSONSchemaVersion = objection.JSONSchemaVersion;
+export import JSONSchemaDefinition = objection.JSONSchemaDefinition;
+export import JSONSchema = objection.JSONSchema;

package/typings/objection/index.d.ts

@@ -15,12 +15,7 @@
 import Ajv, { Options as AjvOptions } from 'ajv';
 import * as dbErrors from 'db-errors';
 import { Knex } from 'knex';
-import {
-  GraphNode,
-  ParseError,
-  ParseRelationExpression,
-  UnknownGraph,
-} from './relation-expression';
+import { GraphNode, ParseError, ParseRelationExpression } from './relation-expression';
 
 // Export the entire Objection namespace.
 export = Objection;
@@ -2221,6 +2216,9 @@ declare namespace Objection {
 
     using(columns: string | readonly string[] | Raw | { [key: string]: string | Raw }): JoinBuilder;
     type(type: string): JoinBuilder;
+
+    /** Makes the next condition an `or`: `join.on(a, b).or.on(c, d)`. */
+    readonly or: JoinBuilder;
   }
 
   interface JoinRawMethod<QB extends AnyQueryBuilder> extends RawInterface<QB> {}
@@ -2713,6 +2711,17 @@ declare namespace Objection {
     from: FromMethod<this>;
     table: FromMethod<this>;
     into: FromMethod<this>;
+    /** The table to update from (`update ... from`), postgres only. */
+    updateFrom: FromMethod<this>;
+    /** Tables to delete using (`delete ... using`), postgres only. */
+    using(tables: string | readonly string[]): this;
+
+    /** Adds an SQL comment before the query: `/* comment *\/ select ...`. */
+    comment(comment: string): this;
+    /** Adds optimizer hints to the query: `select /*+ hint *\/ ...`. */
+    hintComment(hints: string | readonly string[]): this;
+    /** Options passed to the database driver. */
+    options(options: Readonly<{ [key: string]: any }>): this;
     fromRaw: FromRawMethod<this>;
 
     jsonExtract: JsonExtract<this>;
@@ -2831,23 +2840,31 @@ declare namespace Objection {
     orHavingRaw: WhereRawMethod<this>;
 
     havingIn: WhereInMethod<this>;
+    andHavingIn: WhereInMethod<this>;
     orHavingIn: WhereInMethod<this>;
     havingNotIn: WhereInMethod<this>;
+    andHavingNotIn: WhereInMethod<this>;
     orHavingNotIn: WhereInMethod<this>;
 
     havingNull: WhereNullMethod<this>;
+    andHavingNull: WhereNullMethod<this>;
     orHavingNull: WhereNullMethod<this>;
     havingNotNull: WhereNullMethod<this>;
+    andHavingNotNull: WhereNullMethod<this>;
     orHavingNotNull: WhereNullMethod<this>;
 
     havingExists: WhereExistsMethod<this>;
+    andHavingExists: WhereExistsMethod<this>;
     orHavingExists: WhereExistsMethod<this>;
     havingNotExists: WhereExistsMethod<this>;
+    andHavingNotExists: WhereExistsMethod<this>;
     orHavingNotExists: WhereExistsMethod<this>;
 
     havingBetween: WhereBetweenMethod<this>;
+    andHavingBetween: WhereBetweenMethod<this>;
     orHavingBetween: WhereBetweenMethod<this>;
     havingNotBetween: WhereBetweenMethod<this>;
+    andHavingNotBetween: WhereBetweenMethod<this>;
     orHavingNotBetween: WhereBetweenMethod<this>;
 
     whereComposite: WhereCompositeMethod<this>;
@@ -3057,6 +3074,8 @@ declare namespace Objection {
     clearSelect: IdentityMethod<this>;
     clearOrder: IdentityMethod<this>;
     clearWhere: IdentityMethod<this>;
+    clearGroup: IdentityMethod<this>;
+    clearHaving: IdentityMethod<this>;
     clearWithGraph: IdentityMethod<this>;
     clearAllowGraph: IdentityMethod<this>;
 
@@ -3071,6 +3090,8 @@ declare namespace Objection {
     catch<FR = never>(
       onrejected?: ((reason: any) => FR | PromiseLike<FR>) | undefined | null,
     ): Promise<R | FR>;
+
+    finally(onfinally?: (() => void) | undefined | null): Promise<R>;
   }
 
   type X<T> = Promise<T>;
@@ -3169,10 +3190,14 @@ declare namespace Objection {
   type RelatedModelClassOf<C> =
     IsAnyType<C> extends true
       ? never
-      : C extends abstract new (...args: any[]) => Model
+      : C extends abstract new (
+            ...args: any[]
+          ) => Model
         ? C
         : C extends () => infer K
-          ? K extends abstract new (...args: any[]) => Model
+          ? K extends abstract new (
+              ...args: any[]
+            ) => Model
             ? K
             : never
           : never;
@@ -3257,7 +3282,9 @@ declare namespace Objection {
    * The instance type of model class `MC`, including the relation properties
    * inferred from its `relationMappings` that the class doesn't declare.
    */
-  export type ModelInstance<MC> = MC extends abstract new (...args: any[]) => infer I
+  export type ModelInstance<MC> = MC extends abstract new (
+    ...args: any[]
+  ) => infer I
     ? WithModelModifiers<
         MC,
         [Exclude<keyof RelationMappingsOf<MC>, keyof I>] extends [never]

package/lib/.eslintrc.json

@@ -1,8 +0,0 @@
-{
-  "parserOptions": {
-    "sourceType": "script"
-  },
-  "rules": {
-    "strict": "error"
-  }
-}

package/lib/queryBuilder/parsers/jsonFieldExpressionParser.pegjs

@@ -1,97 +0,0 @@
-/**
- * Parser for parsing field expressions.
- *
- * Syntax: <column reference>[:<json field reference>]
- *
- * e.g. `Person.jsonColumnName:details.names[1]` would refer to value `'Second'`
- * in column `Person.jsonColumnName` which has
- * `{ details: { names: ['First', 'Second', 'Last'] } }` object stored in it.
- *
- * First part <column reference> is compatible with column references used in
- * knex e.g. "MyFancyTable.tributeToThBestColumnNameEver".
- *
- * Second part describes a path to an attribute inside the referred column.
- * It is optional and it always starts with colon which follows directly with
- * first path element. e.g. `Table.jsonObjectColumnName:jsonFieldName` or
- * `Table.jsonArrayColumn:[321]`.
- *
- * Syntax supports `[<key or index>]` and `.<key or index>` flavors of reference
- * to json keys / array indexes:
- *
- * e.g. both `Table.myColumn:[1][3]` and `Table.myColumn:1.3` would access correctly
- * both of the following objects `[null, [null,null,null, "I was accessed"]]` and
- * `{ "1": { "3" : "I was accessed" } }`
- *
- * Caveats when using special characters in keys:
- *
- * 1. `objectColumn.key` This is the most common syntax, good if you are
- *    not using dots or square brackets `[]` in your json object key name.
- * 2. Keys containing dots `objectColumn:[keywith.dots]` Column `{ "keywith.dots" : "I was referred" }`
- * 3. Keys containing square brackets `column['[]']` `{ "[]" : "This is getting ridiculous..." }`
- * 4. Keys containing square brackets and quotes
- *    `objectColumn:['Double."Quote".[]']` and `objectColumn:["Sinlge.'Quote'.[]"]`
- *    Column `{ "Double.\"Quote\".[]" : "I was referred",  "Sinlge.'Quote'.[]" : "Mee too!" }`
- * 99. Keys containing dots, square brackets, single quotes and double quotes in one json key is
- *     not currently supported
- *
- * For compiling this to parser run `pegjs JsonFieldExpressionParser.pegjs` which generates
- * the `JsonFieldExpressionParser.js`
- *
- * For development there is nice page for interactively hacking parser code
- * http://pegjs.org/online
- */
-
-start =
-  column:stringWithoutColon
-  refs:(':'
-    (bracketIndexRef / bracketStringRef / colonReference)
-    (bracketIndexRef / bracketStringRef / dotReference)*
-  )?
-  {
-    var access = [];
-    if (refs) {
-      var firstAccess = refs[1];
-      access = refs[2];
-      access.unshift(firstAccess);
-    }
-    return { columnName: column, access: access };
-  }
-
-bracketStringRef =
-  '['
-      key:(
-       '"' stringWithoutDoubleQuotes '"' /
-       "'" stringWithoutSingleQuotes "'" /
-       stringWithoutSquareBrackets
-      )
-  ']'
-  { return { type: 'object', ref: Array.isArray(key) ? key[1] : key }; }
-
-bracketIndexRef =
-  '[' index:integer ']'
-  { return { type: 'array', ref: parseInt(index, 10) }; }
-
-colonReference =
-  key:stringWithoutSquareBracketsOrDots
-  { return { type: 'object', ref: key }; }
-
-dotReference =
-  '.' key:stringWithoutSquareBracketsOrDots
-  { return { type: 'object', ref: key }; }
-
-stringWithoutSquareBrackets =
-  chars:([^\x5D\x5B])+ { return chars.join(""); }
-
-stringWithoutColon =
-  chars:([^:])+ { return chars.join(""); }
-
-stringWithoutDoubleQuotes =
-  chars:([^"])+ { return chars.join(""); }
-
-stringWithoutSingleQuotes =
-  chars:([^'])+ { return chars.join(""); }
-
-stringWithoutSquareBracketsOrDots =
-  chars:([^.\x5D\x5B])+ { return chars.join(""); }
-
-integer = digits:[0-9]+ { return digits.join(""); }