objection 3.1.1 → 3.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (54) hide show
  1. package/README.md +2 -2
  2. package/lib/model/AjvValidator.js +15 -6
  3. package/lib/model/Model.js +1 -1
  4. package/lib/model/graph/ModelGraphBuilder.js +2 -2
  5. package/lib/model/inheritModel.js +1 -1
  6. package/lib/model/modelQueryProps.js +1 -1
  7. package/lib/model/modelSet.js +1 -1
  8. package/lib/model/modelTableMetadata.js +1 -1
  9. package/lib/queryBuilder/QueryBuilder.js +9 -9
  10. package/lib/queryBuilder/QueryBuilderBase.js +16 -16
  11. package/lib/queryBuilder/QueryBuilderOperationSupport.js +3 -3
  12. package/lib/queryBuilder/graph/GraphNodeDbExistence.js +1 -1
  13. package/lib/queryBuilder/graph/GraphOptions.js +1 -1
  14. package/lib/queryBuilder/graph/GraphUpsert.js +5 -5
  15. package/lib/queryBuilder/graph/delete/GraphDelete.js +1 -1
  16. package/lib/queryBuilder/graph/insert/GraphInsert.js +1 -1
  17. package/lib/queryBuilder/graph/insert/GraphInsertAction.js +1 -1
  18. package/lib/queryBuilder/graph/insert/JoinRowGraphInsertAction.js +3 -3
  19. package/lib/queryBuilder/graph/patch/GraphPatch.js +1 -1
  20. package/lib/queryBuilder/graph/patch/GraphPatchAction.js +1 -1
  21. package/lib/queryBuilder/graph/recursiveUpsert/GraphRecursiveUpsertAction.js +2 -2
  22. package/lib/queryBuilder/join/JoinResultParser.js +1 -1
  23. package/lib/queryBuilder/join/RelationJoiner.js +7 -7
  24. package/lib/queryBuilder/operations/FromOperation.js +1 -1
  25. package/lib/queryBuilder/operations/ObjectionToKnexConvertingOperation.js +3 -3
  26. package/lib/queryBuilder/operations/UpdateOperation.js +1 -1
  27. package/lib/queryBuilder/operations/UpsertGraphOperation.js +2 -2
  28. package/lib/queryBuilder/operations/eager/WhereInEagerOperation.js +3 -3
  29. package/lib/queryBuilder/operations/jsonApi/WhereJsonHasPostgresOperation.js +1 -1
  30. package/lib/queryBuilder/operations/jsonApi/WhereJsonNotObjectPostgresOperation.js +1 -1
  31. package/lib/queryBuilder/operations/jsonApi/WhereJsonPostgresOperation.js +1 -1
  32. package/lib/queryBuilder/operations/jsonApi/postgresJsonApi.js +3 -3
  33. package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeMsSqlOperation.js +5 -5
  34. package/lib/queryBuilder/parsers/jsonFieldExpressionParser.js +3 -3
  35. package/lib/queryBuilder/parsers/relationExpressionParser.js +5 -5
  36. package/lib/relations/Relation.js +6 -6
  37. package/lib/relations/RelationOwner.js +1 -1
  38. package/lib/relations/belongsToOne/BelongsToOneUnrelateOperation.js +1 -1
  39. package/lib/relations/hasMany/HasManyInsertOperation.js +1 -1
  40. package/lib/relations/hasMany/HasManyRelateOperation.js +1 -1
  41. package/lib/relations/manyToMany/ManyToManyRelation.js +5 -5
  42. package/lib/relations/manyToMany/delete/ManyToManyDeleteSqliteOperation.js +1 -1
  43. package/lib/relations/manyToMany/relate/ManyToManyRelateOperation.js +3 -3
  44. package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateSqliteOperation.js +1 -1
  45. package/lib/relations/manyToMany/update/ManyToManyUpdateOperationBase.js +1 -1
  46. package/lib/relations/manyToMany/update/ManyToManyUpdateSqliteOperation.js +1 -1
  47. package/lib/transaction.js +7 -7
  48. package/lib/utils/assert.js +1 -1
  49. package/lib/utils/clone.js +2 -2
  50. package/lib/utils/identifierMapping.js +1 -1
  51. package/lib/utils/normalizeIds.js +1 -1
  52. package/lib/utils/resolveModel.js +2 -2
  53. package/package.json +4 -4
  54. package/typings/objection/index.d.ts +62 -62
@@ -52,7 +52,7 @@ declare namespace Objection {
52
52
  export interface ValueBuilder extends Castable {}
53
53
  export interface ValueFunction {
54
54
  (
55
- value: PrimitiveValue | PrimitiveValue[] | PrimitiveValueObject | PrimitiveValueObject[]
55
+ value: PrimitiveValue | PrimitiveValue[] | PrimitiveValueObject | PrimitiveValueObject[],
56
56
  ): ValueBuilder;
57
57
  }
58
58
 
@@ -383,7 +383,7 @@ declare namespace Objection {
383
383
  column: ModelProps<ModelType<QBP>>,
384
384
  path: string,
385
385
  alias?: string,
386
- singleValue?: boolean
386
+ singleValue?: boolean,
387
387
  ): QB;
388
388
 
389
389
  (column: ColumnRef, path: string, alias?: string, singleValue?: boolean): QB;
@@ -396,7 +396,7 @@ declare namespace Objection {
396
396
  column: ModelProps<ModelType<QBP>>,
397
397
  path: string,
398
398
  value: any,
399
- alias?: string
399
+ alias?: string,
400
400
  ): QB;
401
401
 
402
402
  (column: ColumnRef, path: string, value: any, alias?: string): QB;
@@ -408,7 +408,7 @@ declare namespace Objection {
408
408
  column: ModelProps<ModelType<QBP>>,
409
409
  path: string,
410
410
  value: any,
411
- alias?: string
411
+ alias?: string,
412
412
  ): QB;
413
413
 
414
414
  (column: ColumnRef, path: string, value: any, alias?: string): QB;
@@ -426,7 +426,7 @@ declare namespace Objection {
426
426
  <QBP extends QB>(
427
427
  col: ModelProps<ModelType<QBP>>,
428
428
  op: Operator,
429
- expr: Expression<PrimitiveValue>
429
+ expr: Expression<PrimitiveValue>,
430
430
  ): QB;
431
431
 
432
432
  <QBP extends QB>(col: ModelProps<ModelType<QBP>>, expr: Expression<PrimitiveValue>): QB;
@@ -499,7 +499,7 @@ declare namespace Objection {
499
499
  col: ModelProps<ModelType<QBP>>,
500
500
  jsonPath: string,
501
501
  operator: string,
502
- value: any
502
+ value: any,
503
503
  ): QB;
504
504
 
505
505
  (col: ColumnRef, jsonPath: string, operator: string, value: any): QB;
@@ -508,7 +508,7 @@ declare namespace Objection {
508
508
  interface WhereJsonMethod<QB extends AnyQueryBuilder> {
509
509
  (
510
510
  fieldExpression: FieldExpression,
511
- jsonObjectOrFieldExpression: JsonObjectOrFieldExpression
511
+ jsonObjectOrFieldExpression: JsonObjectOrFieldExpression,
512
512
  ): QB;
513
513
  }
514
514
 
@@ -524,7 +524,7 @@ declare namespace Objection {
524
524
  (
525
525
  fieldExpression: FieldExpression,
526
526
  operator: string,
527
- value: boolean | number | string | null
527
+ value: boolean | number | string | null,
528
528
  ): QB;
529
529
  }
530
530
 
@@ -563,7 +563,7 @@ declare namespace Objection {
563
563
  arg2: QBOrCallback<QB>,
564
564
  arg3: QBOrCallback<QB>,
565
565
  arg4: QBOrCallback<QB>,
566
- wrap?: boolean
566
+ wrap?: boolean,
567
567
  ): QB;
568
568
  (
569
569
  arg1: QBOrCallback<QB>,
@@ -571,7 +571,7 @@ declare namespace Objection {
571
571
  arg3: QBOrCallback<QB>,
572
572
  arg4: QBOrCallback<QB>,
573
573
  arg5: QBOrCallback<QB>,
574
- wrap?: boolean
574
+ wrap?: boolean,
575
575
  ): QB;
576
576
  (
577
577
  arg1: QBOrCallback<QB>,
@@ -580,7 +580,7 @@ declare namespace Objection {
580
580
  arg4: QBOrCallback<QB>,
581
581
  arg5: QBOrCallback<QB>,
582
582
  arg6: QBOrCallback<QB>,
583
- wrap?: boolean
583
+ wrap?: boolean,
584
584
  ): QB;
585
585
  (
586
586
  arg1: QBOrCallback<QB>,
@@ -590,7 +590,7 @@ declare namespace Objection {
590
590
  arg5: QBOrCallback<QB>,
591
591
  arg6: QBOrCallback<QB>,
592
592
  arg7: QBOrCallback<QB>,
593
- wrap?: boolean
593
+ wrap?: boolean,
594
594
  ): QB;
595
595
  }
596
596
 
@@ -652,9 +652,9 @@ declare namespace Objection {
652
652
  interface OrderByRawMethod<QB extends AnyQueryBuilder> extends RawInterface<QB> {}
653
653
 
654
654
  interface FirstMethod {
655
- <QB extends AnyQueryBuilder>(this: QB): QB extends ArrayQueryBuilder<QB>
656
- ? MaybeSingleQueryBuilder<QB>
657
- : QB;
655
+ <QB extends AnyQueryBuilder>(
656
+ this: QB,
657
+ ): QB extends ArrayQueryBuilder<QB> ? MaybeSingleQueryBuilder<QB> : QB;
658
658
  }
659
659
 
660
660
  type ForIdValue = MaybeCompositeId | AnyQueryBuilder;
@@ -706,7 +706,7 @@ declare namespace Objection {
706
706
  interface ReturningMethod {
707
707
  <QB extends AnyQueryBuilder>(
708
708
  this: QB,
709
- column: string | Raw | (string | Raw)[]
709
+ column: string | Raw | (string | Raw)[],
710
710
  ): QB extends NumberQueryBuilder<QB> ? ArrayQueryBuilder<QB> : QB;
711
711
  }
712
712
 
@@ -768,13 +768,13 @@ declare namespace Objection {
768
768
  <QB extends AnyQueryBuilder>(
769
769
  this: QB,
770
770
  graph: PartialModelGraph<M>,
771
- options?: InsertGraphOptions
771
+ options?: InsertGraphOptions,
772
772
  ): SingleQueryBuilder<QB>;
773
773
 
774
774
  <QB extends AnyQueryBuilder>(
775
775
  this: QB,
776
776
  graph: PartialModelGraph<M>[],
777
- options?: InsertGraphOptions
777
+ options?: InsertGraphOptions,
778
778
  ): ArrayQueryBuilder<QB>;
779
779
  }
780
780
 
@@ -795,13 +795,13 @@ declare namespace Objection {
795
795
  <QB extends AnyQueryBuilder>(
796
796
  this: QB,
797
797
  graph: PartialModelGraph<M>[],
798
- options?: UpsertGraphOptions
798
+ options?: UpsertGraphOptions,
799
799
  ): ArrayQueryBuilder<QB>;
800
800
 
801
801
  <QB extends AnyQueryBuilder>(
802
802
  this: QB,
803
803
  graph: PartialModelGraph<M>,
804
- options?: UpsertGraphOptions
804
+ options?: UpsertGraphOptions,
805
805
  ): SingleQueryBuilder<QB>;
806
806
  }
807
807
 
@@ -820,7 +820,7 @@ declare namespace Objection {
820
820
  interface ModifyGraphMethod<QB extends AnyQueryBuilder> {
821
821
  <M extends Model>(
822
822
  expr: RelationExpression<ModelType<QB>>,
823
- modifier: Modifier<QueryBuilderType<M>>
823
+ modifier: Modifier<QueryBuilderType<M>>,
824
824
  ): QB;
825
825
  }
826
826
 
@@ -848,7 +848,7 @@ declare namespace Objection {
848
848
 
849
849
  export interface CatchablePromiseLike<R> extends PromiseLike<R> {
850
850
  catch<FR = never>(
851
- onrejected?: ((reason: any) => FR | PromiseLike<FR>) | undefined | null
851
+ onrejected?: ((reason: any) => FR | PromiseLike<FR>) | undefined | null,
852
852
  ): Promise<R | FR>;
853
853
  }
854
854
 
@@ -1050,7 +1050,7 @@ declare namespace Objection {
1050
1050
  updateAndFetch(update: PartialModelObject<M>): SingleQueryBuilder<this>;
1051
1051
  updateAndFetchById(
1052
1052
  id: MaybeCompositeId,
1053
- update: PartialModelObject<M>
1053
+ update: PartialModelObject<M>,
1054
1054
  ): SingleQueryBuilder<this>;
1055
1055
 
1056
1056
  patch(update: PartialModelObject<M>): NumberQueryBuilder<this>;
@@ -1058,7 +1058,7 @@ declare namespace Objection {
1058
1058
  patchAndFetch(update: PartialModelObject<M>): SingleQueryBuilder<this>;
1059
1059
  patchAndFetchById(
1060
1060
  id: MaybeCompositeId,
1061
- update: PartialModelObject<M>
1061
+ update: PartialModelObject<M>,
1062
1062
  ): SingleQueryBuilder<this>;
1063
1063
 
1064
1064
  del(): NumberQueryBuilder<this>;
@@ -1078,7 +1078,7 @@ declare namespace Objection {
1078
1078
  insertAndFetch(): SingleQueryBuilder<this>;
1079
1079
 
1080
1080
  relate(
1081
- ids: MaybeCompositeId | MaybeCompositeId[] | PartialModelObject<M> | PartialModelObject<M>[]
1081
+ ids: MaybeCompositeId | MaybeCompositeId[] | PartialModelObject<M> | PartialModelObject<M>[],
1082
1082
  ): NumberQueryBuilder<this>;
1083
1083
 
1084
1084
  unrelate(): NumberQueryBuilder<this>;
@@ -1091,7 +1091,7 @@ declare namespace Objection {
1091
1091
  allowGraph: AllowGraphMethod<this>;
1092
1092
 
1093
1093
  throwIfNotFound: (
1094
- arg?: any
1094
+ arg?: any,
1095
1095
  ) => R extends Model | undefined ? SingleQueryBuilder<QueryBuilder<M, M>> : this;
1096
1096
 
1097
1097
  returning: ReturningMethod;
@@ -1182,11 +1182,11 @@ declare namespace Objection {
1182
1182
 
1183
1183
  then<R1 = R, R2 = never>(
1184
1184
  onfulfilled?: ((value: R) => R1 | PromiseLike<R1>) | undefined | null,
1185
- onrejected?: ((reason: any) => R2 | PromiseLike<R2>) | undefined | null
1185
+ onrejected?: ((reason: any) => R2 | PromiseLike<R2>) | undefined | null,
1186
1186
  ): Promise<R1 | R2>;
1187
1187
 
1188
1188
  catch<FR = never>(
1189
- onrejected?: ((reason: any) => FR | PromiseLike<FR>) | undefined | null
1189
+ onrejected?: ((reason: any) => FR | PromiseLike<FR>) | undefined | null,
1190
1190
  ): Promise<R | FR>;
1191
1191
  }
1192
1192
 
@@ -1229,7 +1229,7 @@ declare namespace Objection {
1229
1229
  type ModelClassSpecifier = ModelClassFactory | AnyModelConstructor | string;
1230
1230
  type RelationMappingHook<M extends Model> = (
1231
1231
  model: M,
1232
- context: QueryContext
1232
+ context: QueryContext,
1233
1233
  ) => Promise<void> | void;
1234
1234
  type StringOrReferenceBuilder = string | ReferenceBuilder;
1235
1235
  type RelationMappingColumnRef = StringOrReferenceBuilder | StringOrReferenceBuilder[];
@@ -1461,12 +1461,12 @@ declare namespace Objection {
1461
1461
 
1462
1462
  relatedQuery<K extends keyof M>(
1463
1463
  relationName: K,
1464
- trxOrKnex?: TransactionOrKnex
1464
+ trxOrKnex?: TransactionOrKnex,
1465
1465
  ): ArrayRelatedQueryBuilder<M[K]>;
1466
1466
 
1467
1467
  relatedQuery<RM extends Model>(
1468
1468
  relationName: string,
1469
- trxOrKnex?: TransactionOrKnex
1469
+ trxOrKnex?: TransactionOrKnex,
1470
1470
  ): QueryBuilderType<RM>;
1471
1471
 
1472
1472
  fromJson(json: object, opt?: ModelOptions): M;
@@ -1486,7 +1486,7 @@ declare namespace Objection {
1486
1486
  transaction<T>(callback: (trx: Transaction) => Promise<T>): Promise<T>;
1487
1487
  transaction<T>(
1488
1488
  trxOrKnex: TransactionOrKnex,
1489
- callback: (trx: Transaction) => Promise<T>
1489
+ callback: (trx: Transaction) => Promise<T>,
1490
1490
  ): Promise<T>;
1491
1491
 
1492
1492
  bindKnex(trxOrKnex: TransactionOrKnex): this;
@@ -1495,13 +1495,13 @@ declare namespace Objection {
1495
1495
  fetchGraph(
1496
1496
  modelOrObject: PartialModelObject<M>,
1497
1497
  expression: RelationExpression<M>,
1498
- options?: FetchGraphOptions
1498
+ options?: FetchGraphOptions,
1499
1499
  ): SingleQueryBuilder<QueryBuilderType<M>>;
1500
1500
 
1501
1501
  fetchGraph(
1502
1502
  modelOrObject: PartialModelObject<M>[],
1503
1503
  expression: RelationExpression<M>,
1504
- options?: FetchGraphOptions
1504
+ options?: FetchGraphOptions,
1505
1505
  ): QueryBuilderType<M>;
1506
1506
 
1507
1507
  getRelations(): Relations;
@@ -1511,13 +1511,13 @@ declare namespace Objection {
1511
1511
  traverse(
1512
1512
  filterConstructor: ModelConstructor<Model>,
1513
1513
  models: Model | Model[],
1514
- traverser: TraverserFunction
1514
+ traverser: TraverserFunction,
1515
1515
  ): void;
1516
1516
  traverseAsync(models: Model | Model[], traverser: TraverserFunction): Promise<void>;
1517
1517
  traverseAsync(
1518
1518
  filterConstructor: ModelConstructor<Model>,
1519
1519
  models: Model | Model[],
1520
- traverser: TraverserFunction
1520
+ traverser: TraverserFunction,
1521
1521
  ): Promise<void>;
1522
1522
 
1523
1523
  beforeFind(args: StaticHookArguments<any>): any;
@@ -1565,18 +1565,18 @@ declare namespace Objection {
1565
1565
 
1566
1566
  static query<M extends Model>(
1567
1567
  this: Constructor<M>,
1568
- trxOrKnex?: TransactionOrKnex
1568
+ trxOrKnex?: TransactionOrKnex,
1569
1569
  ): QueryBuilderType<M>;
1570
1570
 
1571
1571
  static relatedQuery<M extends Model, K extends keyof M>(
1572
1572
  this: Constructor<M>,
1573
1573
  relationName: K,
1574
- trxOrKnex?: TransactionOrKnex
1574
+ trxOrKnex?: TransactionOrKnex,
1575
1575
  ): ArrayRelatedQueryBuilder<M[K]>;
1576
1576
 
1577
1577
  static relatedQuery<RM extends Model>(
1578
1578
  relationName: string,
1579
- trxOrKnex?: TransactionOrKnex
1579
+ trxOrKnex?: TransactionOrKnex,
1580
1580
  ): QueryBuilderType<RM>;
1581
1581
 
1582
1582
  static fromJson<M extends Model>(this: Constructor<M>, json: object, opt?: ModelOptions): M;
@@ -1596,7 +1596,7 @@ declare namespace Objection {
1596
1596
  static transaction<T>(callback: (trx: Transaction) => Promise<T>): Promise<T>;
1597
1597
  static transaction<T>(
1598
1598
  trxOrKnex: TransactionOrKnex,
1599
- callback: (trx: Transaction) => Promise<T>
1599
+ callback: (trx: Transaction) => Promise<T>,
1600
1600
  ): Promise<T>;
1601
1601
 
1602
1602
  static bindKnex<M>(this: M, trxOrKnex: TransactionOrKnex): M;
@@ -1606,14 +1606,14 @@ declare namespace Objection {
1606
1606
  this: Constructor<M>,
1607
1607
  modelOrObject: PartialModelObject<M>,
1608
1608
  expression: RelationExpression<M>,
1609
- options?: FetchGraphOptions
1609
+ options?: FetchGraphOptions,
1610
1610
  ): SingleQueryBuilder<QueryBuilderType<M>>;
1611
1611
 
1612
1612
  static fetchGraph<M extends Model>(
1613
1613
  this: Constructor<M>,
1614
1614
  modelOrObject: PartialModelObject<M>[],
1615
1615
  expression: RelationExpression<M>,
1616
- options?: FetchGraphOptions
1616
+ options?: FetchGraphOptions,
1617
1617
  ): QueryBuilderType<M>;
1618
1618
 
1619
1619
  static getRelations(): Relations;
@@ -1623,13 +1623,13 @@ declare namespace Objection {
1623
1623
  static traverse(
1624
1624
  filterConstructor: typeof Model,
1625
1625
  models: Model | Model[],
1626
- traverser: TraverserFunction
1626
+ traverser: TraverserFunction,
1627
1627
  ): void;
1628
1628
  static traverseAsync(models: Model | Model[], traverser: TraverserFunction): Promise<void>;
1629
1629
  static traverseAsync(
1630
1630
  filterConstructor: typeof Model,
1631
1631
  models: Model | Model[],
1632
- traverser: TraverserFunction
1632
+ traverser: TraverserFunction,
1633
1633
  ): Promise<void>;
1634
1634
 
1635
1635
  static beforeFind(args: StaticHookArguments<any>): any;
@@ -1645,12 +1645,12 @@ declare namespace Objection {
1645
1645
 
1646
1646
  $relatedQuery<K extends keyof this>(
1647
1647
  relationName: K,
1648
- trxOrKnex?: TransactionOrKnex
1648
+ trxOrKnex?: TransactionOrKnex,
1649
1649
  ): RelatedQueryBuilder<this[K]>;
1650
1650
 
1651
1651
  $relatedQuery<RM extends Model>(
1652
1652
  relationName: string,
1653
- trxOrKnex?: TransactionOrKnex
1653
+ trxOrKnex?: TransactionOrKnex,
1654
1654
  ): QueryBuilderType<RM>;
1655
1655
 
1656
1656
  $query(trxOrKnex?: TransactionOrKnex): SingleQueryBuilder<QueryBuilderType<this>>;
@@ -1660,7 +1660,7 @@ declare namespace Objection {
1660
1660
 
1661
1661
  $fetchGraph(
1662
1662
  expression: RelationExpression<this>,
1663
- options?: FetchGraphOptions
1663
+ options?: FetchGraphOptions,
1664
1664
  ): SingleQueryBuilder<QueryBuilderType<this>>;
1665
1665
 
1666
1666
  $formatDatabaseJson(json: Pojo): Pojo;
@@ -1690,12 +1690,12 @@ declare namespace Objection {
1690
1690
 
1691
1691
  $setRelated<RM extends Model>(
1692
1692
  relation: String | Relation,
1693
- related: RM | RM[] | null | undefined
1693
+ related: RM | RM[] | null | undefined,
1694
1694
  ): this;
1695
1695
 
1696
1696
  $appendRelated<RM extends Model>(
1697
1697
  relation: String | Relation,
1698
- related: RM | RM[] | null | undefined
1698
+ related: RM | RM[] | null | undefined,
1699
1699
  ): this;
1700
1700
 
1701
1701
  $set(obj: Pojo): this;
@@ -1726,7 +1726,7 @@ declare namespace Objection {
1726
1726
 
1727
1727
  <MC1 extends AnyModelConstructor, ReturnValue>(
1728
1728
  modelClass1: MC1,
1729
- callback: (boundModelClass: MC1, trx?: Transaction) => Promise<ReturnValue>
1729
+ callback: (boundModelClass: MC1, trx?: Transaction) => Promise<ReturnValue>,
1730
1730
  ): Promise<ReturnValue>;
1731
1731
 
1732
1732
  <MC1 extends AnyModelConstructor, MC2 extends AnyModelConstructor, ReturnValue>(
@@ -1735,15 +1735,15 @@ declare namespace Objection {
1735
1735
  callback: (
1736
1736
  boundModelClass1: MC1,
1737
1737
  boundModelClass2: MC2,
1738
- trx?: Transaction
1739
- ) => Promise<ReturnValue>
1738
+ trx?: Transaction,
1739
+ ) => Promise<ReturnValue>,
1740
1740
  ): Promise<ReturnValue>;
1741
1741
 
1742
1742
  <
1743
1743
  MC1 extends AnyModelConstructor,
1744
1744
  MC2 extends AnyModelConstructor,
1745
1745
  MC3 extends AnyModelConstructor,
1746
- ReturnValue
1746
+ ReturnValue,
1747
1747
  >(
1748
1748
  modelClass1: MC1,
1749
1749
  modelClass2: MC2,
@@ -1752,8 +1752,8 @@ declare namespace Objection {
1752
1752
  boundModelClass1: MC1,
1753
1753
  boundModelClass2: MC2,
1754
1754
  boundModelClass3: MC3,
1755
- trx?: Transaction
1756
- ) => Promise<ReturnValue>
1755
+ trx?: Transaction,
1756
+ ) => Promise<ReturnValue>,
1757
1757
  ): Promise<ReturnValue>;
1758
1758
 
1759
1759
  <
@@ -1761,7 +1761,7 @@ declare namespace Objection {
1761
1761
  MC2 extends AnyModelConstructor,
1762
1762
  MC3 extends AnyModelConstructor,
1763
1763
  MC4 extends AnyModelConstructor,
1764
- ReturnValue
1764
+ ReturnValue,
1765
1765
  >(
1766
1766
  modelClass1: MC1,
1767
1767
  modelClass2: MC2,
@@ -1772,8 +1772,8 @@ declare namespace Objection {
1772
1772
  boundModelClass2: MC2,
1773
1773
  boundModelClass3: MC3,
1774
1774
  boundModelClass4: MC4,
1775
- trx?: Transaction
1776
- ) => Promise<ReturnValue>
1775
+ trx?: Transaction,
1776
+ ) => Promise<ReturnValue>,
1777
1777
  ): Promise<ReturnValue>;
1778
1778
 
1779
1779
  <
@@ -1782,7 +1782,7 @@ declare namespace Objection {
1782
1782
  MC3 extends AnyModelConstructor,
1783
1783
  MC4 extends AnyModelConstructor,
1784
1784
  MC5 extends AnyModelConstructor,
1785
- ReturnValue
1785
+ ReturnValue,
1786
1786
  >(
1787
1787
  modelClass1: MC1,
1788
1788
  modelClass2: MC2,
@@ -1795,13 +1795,13 @@ declare namespace Objection {
1795
1795
  boundModelClass3: MC3,
1796
1796
  boundModelClass4: MC4,
1797
1797
  boundModelClass5: MC5,
1798
- trx?: Transaction
1799
- ) => Promise<ReturnValue>
1798
+ trx?: Transaction,
1799
+ ) => Promise<ReturnValue>,
1800
1800
  ): Promise<ReturnValue>;
1801
1801
 
1802
1802
  <ReturnValue>(
1803
1803
  knex: Knex,
1804
- callback: (trx: Transaction) => Promise<ReturnValue>
1804
+ callback: (trx: Transaction) => Promise<ReturnValue>,
1805
1805
  ): Promise<ReturnValue>;
1806
1806
  }
1807
1807