chore: Update reference to TypeORM ConnectionOptions > DataSource

e2e-common/test-config.ts

@@ -8,7 +8,7 @@ import {
 } from '@vendure/testing';
 import fs from 'fs-extra';
 import path from 'path';
-import { ConnectionOptions } from 'typeorm';
+import { DataSourceOptions } from 'typeorm';
 
 import { getPackageDir } from './get-package-dir';
 
@@ -81,7 +81,7 @@ export const testConfig = () => {
     });
 };
 
-function getDbConfig(): ConnectionOptions {
+function getDbConfig(): DataSourceOptions {
     const dbType = process.env.DB || 'sqljs';
     switch (dbType) {
         case 'postgres':

packages/core/src/bootstrap.ts

@@ -3,7 +3,7 @@ import { NestFactory } from '@nestjs/core';
 import { getConnectionToken } from '@nestjs/typeorm';
 import { Type } from '@vendure/common/lib/shared-types';
 import cookieSession = require('cookie-session');
-import { Connection, ConnectionOptions, EntitySubscriberInterface } from 'typeorm';
+import { Connection, DataSourceOptions, EntitySubscriberInterface } from 'typeorm';
 
 import { InternalServerError } from './common/error/errors';
 import { getConfig, setConfig } from './config/config-helpers';
@@ -263,7 +263,7 @@ function disableSynchronize(userConfig: Readonly<RuntimeVendureConfig>): Readonl
         dbConnectionOptions: {
             ...userConfig.dbConnectionOptions,
             synchronize: false,
-        } as ConnectionOptions,
+        } as DataSourceOptions,
     };
     return config;
 }

packages/core/src/config/config.service.ts

@@ -1,6 +1,6 @@
 import { DynamicModule, Injectable, Type } from '@nestjs/common';
 import { LanguageCode } from '@vendure/common/lib/generated-types';
-import { ConnectionOptions } from 'typeorm';
+import { DataSourceOptions } from 'typeorm';
 
 import { getConfig } from './config-helpers';
 import { CustomFields } from './custom-field/custom-field-types';
@@ -68,7 +68,7 @@ export class ConfigService implements VendureConfig {
         return this.activeConfig.assetOptions;
     }
 
-    get dbConnectionOptions(): ConnectionOptions {
+    get dbConnectionOptions(): DataSourceOptions {
         return this.activeConfig.dbConnectionOptions;
     }
 

packages/core/src/config/vendure-config.ts

@@ -3,7 +3,7 @@ import { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.int
 import { LanguageCode } from '@vendure/common/lib/generated-types';
 import { PluginDefinition } from 'apollo-server-core';
 import { ValidationContext } from 'graphql';
-import { ConnectionOptions } from 'typeorm';
+import { DataSourceOptions } from 'typeorm';
 
 import { Middleware } from '../common';
 import { PermissionDefinition } from '../common/permission-definition';
@@ -1049,7 +1049,7 @@ export interface VendureConfig {
      * See the [TypeORM documentation](https://typeorm.io/#/connection-options) for a
      * full description of all available options.
      */
-    dbConnectionOptions: ConnectionOptions;
+    dbConnectionOptions: DataSourceOptions;
     /**
      * @description
      * The token for the default channel. If not specified, a token

packages/core/src/connection/connection.module.ts

@@ -1,6 +1,6 @@
 import { DynamicModule, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { ConnectionOptions } from 'typeorm';
+import { DataSourceOptions } from 'typeorm';
 
 import { ConfigModule } from '../config/config.module';
 import { ConfigService } from '../config/config.service';
@@ -46,7 +46,7 @@ export class ConnectionModule {
         };
     }
 
-    static getTypeOrmLogger(dbConnectionOptions: ConnectionOptions) {
+    static getTypeOrmLogger(dbConnectionOptions: DataSourceOptions) {
         if (!dbConnectionOptions.logger) {
             return new TypeOrmLogger(dbConnectionOptions.logging);
         } else {

packages/core/src/entity/register-custom-entity-fields.ts

@@ -4,7 +4,7 @@ import {
     Column,
     ColumnOptions,
     ColumnType,
-    ConnectionOptions,
+    DataSourceOptions,
     Index,
     JoinColumn,
     JoinTable,
@@ -168,7 +168,7 @@ function registerCustomFieldsForEntity(
     }
 }
 
-function formatDefaultDatetime(dbEngine: ConnectionOptions['type'], datetime: any): Date | string {
+function formatDefaultDatetime(dbEngine: DataSourceOptions['type'], datetime: any): Date | string {
     if (!datetime) {
         return datetime;
     }
@@ -185,7 +185,7 @@ function formatDefaultDatetime(dbEngine: ConnectionOptions['type'], datetime: an
 }
 
 function getColumnType(
-    dbEngine: ConnectionOptions['type'],
+    dbEngine: DataSourceOptions['type'],
     type: Exclude<CustomFieldType, 'relation'>,
 ): ColumnType {
     switch (type) {
@@ -232,7 +232,7 @@ function getColumnType(
     return 'varchar';
 }
 
-function getDefault(customField: CustomFieldConfig, dbEngine: ConnectionOptions['type']) {
+function getDefault(customField: CustomFieldConfig, dbEngine: DataSourceOptions['type']) {
     const { name, type, list, defaultValue, nullable } = customField;
     if (list && defaultValue) {
         if (dbEngine === 'mysql') {

packages/core/src/migrate.ts

@@ -2,7 +2,7 @@
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
-import { Connection, ConnectionOptions, createConnection } from 'typeorm';
+import { Connection, createConnection, DataSourceOptions } from 'typeorm';
 import { MysqlDriver } from 'typeorm/driver/mysql/MysqlDriver';
 import { camelCase } from 'typeorm/util/StringUtils';
 
@@ -177,7 +177,7 @@ export async function generateMigration(userConfig: Partial<VendureConfig>, opti
     resetConfig();
 }
 
-function createConnectionOptions(userConfig: Partial<VendureConfig>): ConnectionOptions {
+function createConnectionOptions(userConfig: Partial<VendureConfig>): DataSourceOptions {
     return Object.assign({ logging: ['query', 'error', 'schema'] }, userConfig.dbConnectionOptions, {
         subscribers: [],
         synchronize: false,

packages/core/src/service/helpers/list-query-builder/parse-filter-params.ts

@@ -1,6 +1,6 @@
 import { Type } from '@vendure/common/lib/shared-types';
 import { assertNever } from '@vendure/common/lib/shared-utils';
-import { Connection, ConnectionOptions } from 'typeorm';
+import { Connection, DataSourceOptions } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
 
 import { InternalServerError, UserInputError } from '../../../common/error/errors';
@@ -85,7 +85,7 @@ function buildWhereCondition(
     operator: Operator,
     operand: any,
     argIndex: number,
-    dbType: ConnectionOptions['type'],
+    dbType: DataSourceOptions['type'],
 ): WhereCondition {
     switch (operator) {
         case 'eq':
@@ -206,7 +206,7 @@ function convertDate(input: Date | string | number): string | number {
 /**
  * Returns a valid regexp clause based on the current DB driver type.
  */
-function getRegexpClause(fieldName: string, argIndex: number, dbType: ConnectionOptions['type']): string {
+function getRegexpClause(fieldName: string, argIndex: number, dbType: DataSourceOptions['type']): string {
     switch (dbType) {
         case 'mariadb':
         case 'mysql':

packages/dev-server/dev-config.ts

@@ -14,7 +14,7 @@ import { ElasticsearchPlugin } from '@vendure/elasticsearch-plugin';
 import { defaultEmailHandlers, EmailPlugin } from '@vendure/email-plugin';
 import { BullMQJobQueuePlugin } from '@vendure/job-queue-plugin/package/bullmq';
 import path from 'path';
-import { ConnectionOptions } from 'typeorm';
+import { DataSourceOptions } from 'typeorm';
 
 import { MultivendorPlugin } from './test-plugins/multivendor-plugin/multivendor.plugin';
 
@@ -50,7 +50,7 @@ export const devConfig: VendureConfig = {
     },
     dbConnectionOptions: {
         synchronize: false,
-        logging: false,
+        logging: true,
         migrations: [path.join(__dirname, 'migrations/*.ts')],
         ...getDbConfig(),
     },
@@ -58,7 +58,7 @@ export const devConfig: VendureConfig = {
         paymentMethodHandlers: [dummyPaymentHandler],
     },
     customFields: {},
-    logger: new DefaultLogger({ level: LogLevel.Verbose }),
+    logger: new DefaultLogger({ level: LogLevel.Debug }),
     importExportOptions: {
         importAssetsDir: path.join(__dirname, 'import-assets'),
     },
@@ -69,8 +69,8 @@ export const devConfig: VendureConfig = {
             assetUploadDir: path.join(__dirname, 'assets'),
         }),
         DefaultSearchPlugin.init({ bufferUpdates: false, indexStockStatus: false }),
-        // BullMQJobQueuePlugin.init({}),
-        DefaultJobQueuePlugin.init({}),
+        BullMQJobQueuePlugin.init({}),
+        // DefaultJobQueuePlugin.init({}),
         // JobQueueTestPlugin.init({ queueCount: 10 }),
         // ElasticsearchPlugin.init({
         //     host: 'http://localhost',
@@ -96,7 +96,7 @@ export const devConfig: VendureConfig = {
     ],
 };
 
-function getDbConfig(): ConnectionOptions {
+function getDbConfig(): DataSourceOptions {
     const dbType = process.env.DB || 'mysql';
     switch (dbType) {
         case 'postgres':

packages/job-queue-plugin/src/bullmq/bullmq-job-queue-strategy.ts

@@ -11,7 +11,7 @@ import {
     PaginatedList,
 } from '@vendure/core';
 import Bull, {
-    ConnectionOptions,
+    DataSourceOptions,
     JobType,
     Processor,
     Queue,
@@ -38,7 +38,7 @@ const DEFAULT_CONCURRENCY = 3;
  */
 export class BullMQJobQueueStrategy implements InspectableJobQueueStrategy {
     private redisConnection: Redis.Redis | Redis.Cluster;
-    private connectionOptions: ConnectionOptions;
+    private connectionOptions: DataSourceOptions;
     private queue: Queue;
     private worker: Worker;
     private scheduler: QueueScheduler;

packages/job-queue-plugin/src/bullmq/types.ts

@@ -1,5 +1,5 @@
 import { Job } from '@vendure/core';
-import { ConnectionOptions, QueueSchedulerOptions, WorkerOptions } from 'bullmq';
+import { DataSourceOptions, QueueSchedulerOptions, WorkerOptions } from 'bullmq';
 import { QueueOptions } from 'bullmq';
 
 /**
@@ -19,7 +19,7 @@ export interface BullMQPluginOptions {
      *
      * If omitted, it will attempt to connect to Redis at `127.0.0.1:6379`.
      */
-    connection?: ConnectionOptions;
+    connection?: DataSourceOptions;
     /**
      * @description
      * Additional options used when instantiating the BullMQ

packages/testing/src/initializers/initializers.ts

@@ -1,8 +1,8 @@
-import { ConnectionOptions } from 'typeorm';
+import { DataSourceOptions } from 'typeorm';
 
 import { TestDbInitializer } from './test-db-initializer';
 
-export type InitializerRegistry = { [type in ConnectionOptions['type']]?: TestDbInitializer<any> };
+export type InitializerRegistry = { [type in DataSourceOptions['type']]?: TestDbInitializer<any> };
 
 const initializerRegistry: InitializerRegistry = {};
 
@@ -13,11 +13,11 @@ const initializerRegistry: InitializerRegistry = {};
  *
  * @docsCategory testing
  */
-export function registerInitializer(type: ConnectionOptions['type'], initializer: TestDbInitializer<any>) {
+export function registerInitializer(type: DataSourceOptions['type'], initializer: TestDbInitializer<any>) {
     initializerRegistry[type] = initializer;
 }
 
-export function getInitializerFor(type: ConnectionOptions['type']): TestDbInitializer<any> {
+export function getInitializerFor(type: DataSourceOptions['type']): TestDbInitializer<any> {
     const initializer = initializerRegistry[type];
     if (!initializer) {
         throw new Error(`No initializer has been registered for the database type "${type}"`);

packages/testing/src/initializers/mysql-initializer.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { ConnectionOptions } from 'typeorm';
+import { DataSourceOptions } from 'typeorm';
 import { MysqlConnectionOptions } from 'typeorm/driver/mysql/MysqlConnectionOptions';
 import { promisify } from 'util';
 

packages/testing/src/initializers/test-db-initializer.ts

@@ -1,4 +1,4 @@
-import { ConnectionOptions } from 'typeorm';
+import { DataSourceOptions } from 'typeorm';
 import { BaseConnectionOptions } from 'typeorm/connection/BaseConnectionOptions';
 
 /**