Merge branch 'master' into remove-deprecated-globals

michaelbromley · web-flow · commit 97dcf67ab2f9 · 2026-03-06T08:28:54.000+01:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -30,11 +30,11 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: javascript-typescript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:javascript-typescript"
diff --git a/docs/docs/guides/8-migration-v1.md b/docs/docs/guides/8-migration-v1.md
@@ -224,3 +224,7 @@ The same applies to find options:
 // After
 { lock: { mode: "pessimistic_write", onLocked: "nowait" } }
 ```
+
+### `WhereExpression` type alias
+
+The deprecated `WhereExpression` type alias has been removed. Use `WhereExpressionBuilder` instead.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -83,12 +83,14 @@ export default defineConfig([
 
             // exceptions for eslint/recommended
             "no-async-promise-executor": "warn",
+            "no-useless-assignment": "warn",
             "no-control-regex": "warn",
             "no-empty": "warn",
             "no-loss-of-precision": "warn",
             "no-prototype-builtins": "warn",
             "no-regex-spaces": "warn",
             "no-return-assign": ["error", "always"],
+            "preserve-caught-error": "warn",
         },
     },
     jsdoc({
diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
     "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.3",
+    "@eslint/js": "^10.0.1",
     "@google-cloud/spanner": "^8.6.0",
     "@sap/hana-client": "^2.27.23",
     "@stryker-mutator/core": "^9.5.1",
@@ -130,9 +130,9 @@
     "chai": "^6.2.2",
     "chai-as-promised": "^8.0.2",
     "class-transformer": "^0.5.1",
-    "eslint": "^9.39.3",
+    "eslint": "^10.0.2",
     "eslint-plugin-chai-friendly": "^1.1.0",
-    "eslint-plugin-jsdoc": "^62.7.0",
+    "eslint-plugin-jsdoc": "^62.7.1",
     "globals": "^17.3.0",
     "gulp": "^4.0.2",
     "gulp-rename": "^2.1.0",
@@ -164,7 +164,7 @@
     "standard-changelog": "^7.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.0"
+    "typescript-eslint": "^8.56.1"
   },
   "peerDependencies": {
     "@google-cloud/spanner": "^8.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/commands/CommandUtils.ts b/src/commands/CommandUtils.ts
@@ -19,6 +19,7 @@ export class CommandUtils {
         } catch (err) {
             throw new Error(
                 `Unable to open file: "${dataSourceFilePath}". ${err.message}`,
+                { cause: err },
             )
         }
 
diff --git a/src/commands/MigrationGenerateCommand.ts b/src/commands/MigrationGenerateCommand.ts
@@ -79,7 +79,7 @@ export class MigrationGenerateCommand implements yargs.CommandModule {
             : path.resolve(process.cwd(), args.path)
         const filename = timestamp + "-" + path.basename(fullPath) + extension
 
-        let dataSource: DataSource | undefined = undefined
+        let dataSource: DataSource | undefined
         try {
             dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
diff --git a/src/driver/DriverUtils.ts b/src/driver/DriverUtils.ts
@@ -239,7 +239,7 @@ export class DriverUtils {
             secondSlash !== -1 ? preBase.substr(0, secondSlash) : preBase
         let afterBase =
             secondSlash !== -1 ? preBase.substr(secondSlash + 1) : undefined
-        let afterQuestionMark = ""
+        let afterQuestionMark: string
         let host = undefined
         let port = undefined
         let hostReplicaSet = undefined
diff --git a/src/driver/aurora-mysql/AuroraMysqlQueryRunner.ts b/src/driver/aurora-mysql/AuroraMysqlQueryRunner.ts
@@ -799,7 +799,7 @@ export class AuroraMysqlQueryRunner
                 `Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`,
             )
 
-        let newColumn: TableColumn | undefined = undefined
+        let newColumn: TableColumn
         if (InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName
         } else {
@@ -2827,7 +2827,7 @@ export class AuroraMysqlQueryRunner
         skipPrimary: boolean,
         skipName: boolean = false,
     ) {
-        let c = ""
+        let c: string
         if (skipName) {
             c = this.connection.driver.createFullType(column)
         } else {
diff --git a/src/driver/mysql/MysqlQueryRunner.ts b/src/driver/mysql/MysqlQueryRunner.ts
@@ -1055,7 +1055,7 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
                 `Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`,
             )
 
-        let newColumn: TableColumn | undefined = undefined
+        let newColumn: TableColumn
         if (InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName
         } else {
@@ -3434,7 +3434,7 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
         skipPrimary: boolean,
         skipName: boolean = false,
     ) {
-        let c = ""
+        let c: string
         if (skipName) {
             c = this.connection.driver.createFullType(column)
         } else {
diff --git a/src/driver/oracle/OracleQueryRunner.ts b/src/driver/oracle/OracleQueryRunner.ts
@@ -1079,7 +1079,7 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
                 )} table.`,
             )
 
-        let newColumn: TableColumn | undefined = undefined
+        let newColumn: TableColumn
         if (InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName
         } else {
diff --git a/src/driver/postgres/PostgresDriver.ts b/src/driver/postgres/PostgresDriver.ts
@@ -913,7 +913,7 @@ export class PostgresDriver implements Driver {
                 const unparsedArrayString = value
 
                 value = []
-                let cube: RegExpExecArray | null = null
+                let cube: RegExpExecArray | null
                 // Iterate through all regexp matches for cubes/null in array
                 while ((cube = regexp.exec(unparsedArrayString)) !== null) {
                     if (cube[1] !== undefined) {
diff --git a/src/driver/sap/SapQueryRunner.ts b/src/driver/sap/SapQueryRunner.ts
@@ -1178,7 +1178,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
                 `Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`,
             )
 
-        let newColumn: TableColumn | undefined = undefined
+        let newColumn: TableColumn
         if (InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName
         } else {
diff --git a/src/driver/sqlite-abstract/AbstractSqliteQueryRunner.ts b/src/driver/sqlite-abstract/AbstractSqliteQueryRunner.ts
@@ -604,7 +604,7 @@ export abstract class AbstractSqliteQueryRunner
                 `Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`,
             )
 
-        let newColumn: TableColumn | undefined = undefined
+        let newColumn: TableColumn
         if (InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName
         } else {
diff --git a/src/driver/sqljs/SqljsDriver.ts b/src/driver/sqljs/SqljsDriver.ts
@@ -106,7 +106,7 @@ export class SqljsDriver extends AbstractSqliteDriver {
             } else {
                 // browser
                 // fileNameOrLocalStorageOrData should be a local storage / indexedDB key
-                let localStorageContent = null
+                let localStorageContent
                 if (this.options.useLocalForage) {
                     if (window.localforage) {
                         localStorageContent = await window.localforage.getItem(
diff --git a/src/driver/sqlserver/SqlServerQueryRunner.ts b/src/driver/sqlserver/SqlServerQueryRunner.ts
@@ -1261,7 +1261,7 @@ export class SqlServerQueryRunner
                 `Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`,
             )
 
-        let newColumn: TableColumn | undefined = undefined
+        let newColumn: TableColumn
         if (InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName
         } else {
diff --git a/src/find-options/FindOptionsUtils.ts b/src/find-options/FindOptionsUtils.ts
@@ -128,7 +128,7 @@ export class FindOptionsUtils {
         prefix: string,
     ): void {
         // find all relations that match given prefix
-        let matchedBaseRelations: RelationMetadata[] = []
+        let matchedBaseRelations: RelationMetadata[]
         if (prefix) {
             const regexp = new RegExp("^" + prefix.replace(".", "\\.") + "\\.")
             matchedBaseRelations = allRelations
diff --git a/src/index.ts b/src/index.ts
@@ -151,7 +151,6 @@ export { RelationQueryBuilder } from "./query-builder/RelationQueryBuilder"
 export { Brackets } from "./query-builder/Brackets"
 export { NotBrackets } from "./query-builder/NotBrackets"
 export type { WhereExpressionBuilder } from "./query-builder/WhereExpressionBuilder"
-export type { WhereExpression } from "./query-builder/WhereExpressionBuilder"
 export { InsertResult } from "./query-builder/result/InsertResult"
 export { UpdateResult } from "./query-builder/result/UpdateResult"
 export { DeleteResult } from "./query-builder/result/DeleteResult"
diff --git a/src/metadata/IndexMetadata.ts b/src/metadata/IndexMetadata.ts
@@ -203,7 +203,7 @@ export class IndexMetadata {
 
         // if columns already an array of string then simply return it
         if (this.givenColumnNames) {
-            let columnPropertyPaths: string[] = []
+            let columnPropertyPaths: string[]
             if (Array.isArray(this.givenColumnNames)) {
                 columnPropertyPaths = this.givenColumnNames.map(
                     (columnName) => {
diff --git a/src/metadata/UniqueMetadata.ts b/src/metadata/UniqueMetadata.ts
@@ -100,7 +100,7 @@ export class UniqueMetadata {
 
         // if columns already an array of string then simply return it
         if (this.givenColumnNames) {
-            let columnPropertyPaths: string[] = []
+            let columnPropertyPaths: string[]
             if (Array.isArray(this.givenColumnNames)) {
                 columnPropertyPaths = this.givenColumnNames.map(
                     (columnName) => {
diff --git a/src/persistence/SubjectDatabaseEntityLoader.ts b/src/persistence/SubjectDatabaseEntityLoader.ts
@@ -106,7 +106,7 @@ export class SubjectDatabaseEntityLoader {
                 }
 
                 // load database entities for all given ids
-                let entities: any[] = []
+                let entities: any[]
                 if (
                     this.queryRunner.connection.driver.options.type ===
                     "mongodb"
diff --git a/src/platform/PlatformTools.ts b/src/platform/PlatformTools.ts
@@ -38,6 +38,7 @@ export class PlatformTools {
         } catch (err) {
             throw new TypeError(
                 `Failed to read package.json for "${name}": ${err.message}`,
+                { cause: err },
             )
         }
     }
diff --git a/src/query-builder/RelationIdLoader.ts b/src/query-builder/RelationIdLoader.ts
@@ -288,7 +288,7 @@ export class RelationIdLoader {
         })
 
         // add conditions for the given entities
-        let condition1 = ""
+        let condition1: string
         if (columns.length === 1) {
             const values = entities.map((entity) =>
                 columns[0].referencedColumn!.getEntityValue(entity),
@@ -524,7 +524,7 @@ export class RelationIdLoader {
         })
 
         // add condition for entities
-        let condition: string = ""
+        let condition: string
         if (relation.entityMetadata.primaryColumns.length === 1) {
             const values = entities.map((entity) =>
                 relation.entityMetadata.primaryColumns[0].getEntityValue(
@@ -673,7 +673,7 @@ export class RelationIdLoader {
         })
 
         // add condition for entities
-        let condition: string = ""
+        let condition: string
         if (relation.joinColumns.length === 1) {
             const values = entities.map((entity) =>
                 relation.joinColumns[0].referencedColumn!.getEntityValue(
diff --git a/src/query-builder/SelectQueryBuilder.ts b/src/query-builder/SelectQueryBuilder.ts
@@ -2515,8 +2515,7 @@ export class SelectQueryBuilder<Entity extends ObjectLiteral>
                     relation.junctionEntityMetadata!.tablePath
 
                 const junctionAlias = joinAttr.junctionAlias
-                let junctionCondition = "",
-                    destinationCondition = ""
+                let junctionCondition: string, destinationCondition: string
 
                 if (relation.isOwning) {
                     junctionCondition = relation.joinColumns
@@ -3542,7 +3541,7 @@ export class SelectQueryBuilder<Entity extends ObjectLiteral>
             new RelationCountMetadataToAttributeTransformer(this.expressionMap)
         relationCountMetadataTransformer.transform()
 
-        let rawResults: any[] = [],
+        let rawResults: any[],
             entities: any[] = []
 
         // for pagination enabled (e.g. skip and take) its much more complicated - its a special process
@@ -3629,7 +3628,7 @@ export class SelectQueryBuilder<Entity extends ObjectLiteral>
                 .getRawMany()
 
             if (rawResults.length > 0) {
-                let condition = ""
+                let condition: string
                 const parameters: ObjectLiteral = {}
                 if (metadata.hasMultiplePrimaryKeys) {
                     condition = rawResults
diff --git a/src/query-builder/UpdateQueryBuilder.ts b/src/query-builder/UpdateQueryBuilder.ts
@@ -581,7 +581,7 @@ export class UpdateQueryBuilder<Entity extends ObjectLiteral>
 
                             const paramName = this.createParameter(value)
 
-                            let expression = null
+                            let expression: string
                             if (
                                 (DriverUtils.isMySQLFamily(
                                     this.connection.driver,
diff --git a/src/query-builder/WhereExpressionBuilder.ts b/src/query-builder/WhereExpressionBuilder.ts
@@ -137,8 +137,3 @@ export interface WhereExpressionBuilder {
      */
     orWhereInIds(ids: any | any[]): this
 }
-
-/**
- * @deprecated Use `WhereExpressionBuilder` instead
- */
-export interface WhereExpression extends WhereExpressionBuilder {}
diff --git a/src/util/OrmUtils.ts b/src/util/OrmUtils.ts
@@ -60,7 +60,7 @@ export class OrmUtils {
         criteriaOrProperty?: ((item: T) => unknown) | K,
     ): T[] {
         return array.reduce((uniqueArray, item) => {
-            let found: boolean = false
+            let found: boolean
             if (typeof criteriaOrProperty === "function") {
                 const itemValue = criteriaOrProperty(item)
                 found = !!uniqueArray.find(
diff --git a/test/github-issues/1780/issue-1780.test.ts b/test/github-issues/1780/issue-1780.test.ts
@@ -82,7 +82,7 @@ describe("github issues > #1780 Support for insertion ignore on duplicate error"
                         })
                     }
                 } catch (err) {
-                    throw new Error(err)
+                    throw new Error(err, { cause: err })
                 }
             }),
         ))
@@ -185,7 +185,7 @@ describe("github issues > #1780 Support for insertion ignore on duplicate error"
                         })
                     }
                 } catch (err) {
-                    throw new Error(err)
+                    throw new Error(err, { cause: err })
                 }
             }),
         ))
diff --git a/test/github-issues/1929/issue-1929.test.ts b/test/github-issues/1929/issue-1929.test.ts
@@ -78,7 +78,6 @@ describe("github issues > #1929 Select attributes in Find method - mongodb", ()
                 await productRepository.save(product)
                 product = new Product("test2", "label2", 20)
                 await productRepository.save(product)
-                product = new Product("test3", "label3", 30)
                 await productRepository.findOne({
                     where: { name: "test2" },
                     select: { name: true, label: true },
diff --git a/test/github-issues/2251/issue-2251.test.ts b/test/github-issues/2251/issue-2251.test.ts
@@ -34,15 +34,15 @@ describe("github issues > #2251 - Unexpected behavior when passing duplicate ent
                     { description: "test2" },
                 ])
 
-                let bars = await repo.find()
+                await repo.find()
                 await repo.save([
                     { id: 1, description: "test1a" },
                     { id: 2, description: "test2a" },
                     { id: 1, description: "test1a" },
                     { id: 2, description: "test2a" },
                 ])
 
-                bars = await repo.find()
+                const bars = await repo.find()
 
                 expect(bars.length).to.equal(2)
             }),
diff --git a/test/github-issues/3047/issue-3047.test.ts b/test/github-issues/3047/issue-3047.test.ts
@@ -61,7 +61,7 @@ describe("github issues > #3047 Mysqsl on duplicate key update use current value
                         expect(loadedUser[0]).to.includes({ is_updated: "yes" })
                     }
                 } catch (err) {
-                    throw new Error(err)
+                    throw new Error(err, { cause: err })
                 }
             }),
         ))
@@ -96,7 +96,7 @@ describe("github issues > #3047 Mysqsl on duplicate key update use current value
                         expect(loadedUser[0]).to.includes({ is_updated: "yes" })
                     }
                 } catch (err) {
-                    throw new Error(err)
+                    throw new Error(err, { cause: err })
                 }
             }),
         ))

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ export class CommandUtils {`
`19`	`19`	`} catch (err) {`
`20`	`20`	`throw new Error(`
`21`	`21`	`Unable to open file: "${dataSourceFilePath}". ${err.message}`,
	`22`	`+ { cause: err },`
`22`	`23`	`)`
`23`	`24`	`}`
`24`	`25`