Merge pull request #9716 from ever-co/chore/upgrade-typeorm-1.0

chore(deps): migrate TypeORM 0.3 -> 1.0

Author: evereq

apps/desktop/package.json

@@ -84,7 +84,7 @@
 		"sound-play": "1.1.0",
 		"squirrelly": "^8.0.8",
 		"twing": "^5.0.2",
-		"typeorm": "^0.3.30",
+		"typeorm": "^1.0.0",
 		"undici": "^6.10.2",
 		"custom-electron-titlebar": "^4.4.1"
 	},

apps/server-api/package.json

@@ -82,7 +82,7 @@
 		"rxjs": "^7.8.2",
 		"squirrelly": "^8.0.8",
 		"twing": "^5.0.2",
-		"typeorm": "^0.3.30",
+		"typeorm": "^1.0.0",
 		"undici": "^6.10.2",
 		"custom-electron-titlebar": "^4.4.1"
 	},

apps/server/package.json

@@ -77,7 +77,7 @@
 		"rxjs": "^7.8.2",
 		"squirrelly": "^8.0.8",
 		"twing": "^5.0.2",
-		"typeorm": "^0.3.30",
+		"typeorm": "^1.0.0",
 		"undici": "^6.10.2",
 		"custom-electron-titlebar": "^4.4.1"
 	},

package.json

@@ -113,7 +113,7 @@
 		"doc:build": "compodoc -p tsconfig.json -d dist/docs",
 		"doc:serve": "compodoc -s -d dist/docs",
 		"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
-		"postinstall.manual": "yarn node ./.scripts/postinstall.js",
+		"postinstall.manual": "patch-package && yarn node ./.scripts/postinstall.js",
 		"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
 		"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn node tools/web/postinstall",
 		"build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn run config:prod && yarn run config:desktop:prod && yarn run pack:desktop && yarn run generate:icons:desktop --environment=prod && yarn run build:package:all:prod && yarn ng:prod run gauzy:desktop-ui --base-href ./ && yarn ng:prod run api:desktop-api && yarn ng:prod build desktop-api --configuration=production --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop --configuration=production --base-href ./ && yarn run prepare:desktop && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
@@ -757,6 +757,7 @@
 		"ng-packagr": "^21.0.0",
 		"node-gyp": "^10.2.0",
 		"npm-run-all": "^4.1.5",
+		"patch-package": "^8.0.1",
 		"nx": "^22.5.2",
 		"pkg": "^5.3.0",
 		"png-to-ico": "^2.1.8",

packages/common/package.json

@@ -37,7 +37,7 @@
 		"graphql": "^16.11.0",
 		"nest-knexjs": "^0.0.30",
 		"slugify": "^1.6.6",
-		"typeorm": "^0.3.30",
+		"typeorm": "^1.0.0",
 		"tslib": "^2.6.2"
 	},
 	"devDependencies": {

packages/config/package.json

@@ -45,7 +45,7 @@
 		"mikro-orm-soft-delete": "^1.0.0-alpha.1",
 		"nest-knexjs": "^0.0.30",
 		"tslib": "^2.6.2",
-		"typeorm": "^0.3.30"
+		"typeorm": "^1.0.0"
 	},
 	"devDependencies": {
 		"@types/jest": "30.0.0",

packages/config/src/lib/database.ts

@@ -6,8 +6,6 @@ import { BetterSqliteDriver, Options as MikroOrmBetterSqliteOptions } from '@mik
 import { PostgreSqlDriver, Options as MikroOrmPostgreSqlOptions } from '@mikro-orm/postgresql';
 import { Options as MikroOrmMySqlOptions, MySqlDriver } from '@mikro-orm/mysql';
 import { DataSourceOptions } from 'typeorm';
-import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-import { MysqlConnectionOptions } from 'typeorm/driver/mysql/MysqlConnectionOptions';
 import { KnexModuleOptions } from 'nest-knexjs';
 import * as path from 'path';
 import * as chalk from 'chalk';
@@ -116,16 +114,17 @@ switch (dbType) {
 		mikroOrmConnectionConfig = mikroOrmMySqlOptions;
 
 		// TypeORM DB Config (MySQL)
-		const typeOrmMySqlOptions: MysqlConnectionOptions = {
+		const typeOrmMySqlOptions: DataSourceOptions = {
 			type: dbType,
+			// TypeORM 1.0 throws on null/undefined in where by default; restore 0.3 'ignore' behavior.
+			invalidWhereValuesBehavior: { null: 'ignore', undefined: 'ignore' },
 			ssl: getTlsOptions(dbSslMode),
 			host: process.env.DB_HOST || 'localhost',
 			port: process.env.DB_PORT ? Number.parseInt(process.env.DB_PORT, 10) : 3306,
 			database: process.env.DB_NAME || 'mysql',
 			username: process.env.DB_USER || 'root',
 			password: process.env.DB_PASS || 'root',
 			// forcing typeorm to use (mysql2) if both (mysql/mysql2) packages found, it prioritize to load (mysql)
-			connectorPackage: 'mysql2',
 			logging: getLoggingOptions(process.env.DB_LOGGING), // by default set to error only
 			logger: 'advanced-console',
 			// log queries that take more than 10 sec as warnings
@@ -212,8 +211,10 @@ switch (dbType) {
 		mikroOrmConnectionConfig = mikroOrmPostgresOptions;
 
 		// TypeORM DB Config (PostgreSQL)
-		const typeOrmPostgresOptions: PostgresConnectionOptions = {
+		const typeOrmPostgresOptions: DataSourceOptions = {
 			type: dbType,
+			// TypeORM 1.0 throws on null/undefined in where by default; restore 0.3 'ignore' behavior.
+			invalidWhereValuesBehavior: { null: 'ignore', undefined: 'ignore' },
 			ssl: getTlsOptions(dbSslMode),
 			host: process.env.DB_HOST || 'localhost',
 			port: process.env.DB_PORT ? Number.parseInt(process.env.DB_PORT, 10) : 5432,
@@ -310,7 +311,9 @@ switch (dbType) {
 
 		// TypeORM DB Config (Better-SQLite3)
 		const typeOrmBetterSqliteConfig: DataSourceOptions = {
-			type: dbType,
+			type: DatabaseTypeEnum.betterSqlite3,
+			// TypeORM 1.0 throws on null/undefined in where by default; restore 0.3 'ignore' behavior.
+			invalidWhereValuesBehavior: { null: 'ignore', undefined: 'ignore' },
 			database: sqlitePath,
 			logging: 'all',
 			logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log

packages/core/package.json

@@ -179,7 +179,7 @@
 		"sql.js": "^1.5.0",
 		"streamifier": "^0.1.1",
 		"swagger-ui-express": "^5.0.0",
-		"typeorm": "^0.3.30",
+		"typeorm": "^1.0.0",
 		"underscore": "^1.13.8",
 		"unleash-client": "^3.16.1",
 		"unzipper": "^0.12.1",

packages/core/src/lib/auth/auth.service.ts

@@ -1691,7 +1691,9 @@ export class AuthService extends SocialAuthService {
 				case MultiORMEnum.TypeORM: {
 					const users = await this.typeOrmUserRepository.find({
 						where: { email },
-						select: ['id']
+						select: {
+                            id: true
+                        }
 					});
 					for (const user of users) {
 						await this.typeOrmUserRepository.update(user.id, { code: magicCode, codeExpireAt });
@@ -2248,7 +2250,8 @@ export class AuthService extends SocialAuthService {
 					break;
 				}
 				case MultiORMEnum.TypeORM: {
-					user = await this.typeOrmUserRepository.findOne({ where, relations });
+					// TODO(typeorm-v1): `relations` no longer accepts a string array. This value references a variable whose shape can't be determined statically — if it holds `string[]`, wrap it: `Object.fromEntries(<expr>?.map(r => [r, true]) ?? [])` (dot-paths need extra nesting handling). If it already holds the v1 object shape, no change needed.
+                    user = await this.typeOrmUserRepository.findOne({ where, relations });
 					break;
 				}
 				default:
@@ -2274,7 +2277,8 @@ export class AuthService extends SocialAuthService {
 					break;
 				}
 				case MultiORMEnum.TypeORM: {
-					employee = await this.typeOrmEmployeeRepository.findOne({ where: employeeWhere, relations: employeeRelations });
+					// TODO(typeorm-v1): `relations` no longer accepts a string array. This value references a variable whose shape can't be determined statically — if it holds `string[]`, wrap it: `Object.fromEntries(<expr>?.map(r => [r, true]) ?? [])` (dot-paths need extra nesting handling). If it already holds the v1 object shape, no change needed.
+                    employee = await this.typeOrmEmployeeRepository.findOne({ where: employeeWhere, relations: employeeRelations });
 					break;
 				}
 				default:
@@ -2385,7 +2389,8 @@ export class AuthService extends SocialAuthService {
 					break;
 				}
 				case MultiORMEnum.TypeORM: {
-					user = await this.typeOrmUserRepository.findOne({ where, relations });
+					// TODO(typeorm-v1): `relations` no longer accepts a string array. This value references a variable whose shape can't be determined statically — if it holds `string[]`, wrap it: `Object.fromEntries(<expr>?.map(r => [r, true]) ?? [])` (dot-paths need extra nesting handling). If it already holds the v1 object shape, no change needed.
+                    user = await this.typeOrmUserRepository.findOne({ where, relations });
 					break;
 				}
 				default:

packages/core/src/lib/availability-slots/commands/handlers/get-conflict-availability-slots.handler.ts

@@ -33,7 +33,7 @@ export class GetConflictAvailabilitySlotsHandler implements ICommandHandler<GetC
 			employeeId
 		});
 
-		switch (this.configService.dbConnectionOptions.type) {
+		switch (this.configService.dbConnectionOptions.type as DatabaseTypeEnum) {
 			case DatabaseTypeEnum.sqlite:
 			case DatabaseTypeEnum.betterSqlite3:
 				query.andWhere(