fix(types): add parent transaction and enhance `where` parameters (#10726)

types/lib/sequelize.d.ts

@@ -1336,7 +1336,7 @@ export function or(...args: (WhereOperators | WhereAttributeHash | Where)[]): Or
 export function json(conditionsOrPath: string | object, value?: string | number | boolean): Json;
 export function json(conditionsOrPath: string | object, value?: string | number | boolean): Json;
 
 
 export type AttributeType = Fn | Col | Literal | ModelAttributeColumnOptions | string;
 export type AttributeType = Fn | Col | Literal | ModelAttributeColumnOptions | string;
-export type LogicType = Fn | Col | Literal | OrOperator | AndOperator | string;
+export type LogicType = Fn | Col | Literal | OrOperator | AndOperator | WhereOperators | string;
 
 
 /**
 /**
  * A way of specifying attr = condition.
  * A way of specifying attr = condition.

types/lib/transaction.d.ts

@@ -129,6 +129,10 @@ export interface TransactionOptions extends Logging {
   isolationLevel?: Transaction.ISOLATION_LEVELS;
   isolationLevel?: Transaction.ISOLATION_LEVELS;
   type?: Transaction.TYPES;
   type?: Transaction.TYPES;
   deferrable?: string | Deferrable;
   deferrable?: string | Deferrable;
+  /**
+   * Parent transaction.
+   */
+  transaction?: Transaction;
 }
 }
 
 
 export default Transaction;
 export default Transaction;

types/test/transaction.ts

@@ -29,3 +29,10 @@ async function transact() {
 }
 }
 
 
 transact();
 transact();
+
+async function nestedTransact() {
+  const tr = await sequelize.transaction({
+    transaction: await sequelize.transaction(),
+  });
+  await tr.commit();
+}

types/test/where.ts

-import { AndOperator, fn, Model, Op, OrOperator, Sequelize, WhereOperators, WhereOptions } from 'sequelize';
+import { AndOperator, fn, Model, Op, OrOperator, Sequelize, WhereOperators, WhereOptions, where as whereFn } from 'sequelize';
 import Transaction from '../lib/transaction';
 import Transaction from '../lib/transaction';
 
 
 class MyModel extends Model {
 class MyModel extends Model {
@@ -252,3 +252,7 @@ where = {
 where = {
 where = {
     [Op.gt]: fn('NOW'),
     [Op.gt]: fn('NOW'),
 };
 };
+
+where = whereFn('test', {
+  [Op.gt]: new Date(),
+});