typeorm 1.0.0-beta.1 → 1.0.0-beta.2

package/browser/connection/ConnectionOptionsReader.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionOptionsReader = void 0;
 const tslib_1 = require("tslib");
-const app_root_path_1 = tslib_1.__importDefault(require("app-root-path"));
-const path_1 = tslib_1.__importDefault(require("path"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const error_1 = require("../error");
 const PlatformTools_1 = require("../platform/PlatformTools");
 const ImportUtils_1 = require("../util/ImportUtils");
@@ -42,10 +41,10 @@ class ConnectionOptionsReader {
         let connectionOptions = undefined;
         const fileFormats = ["js", "mjs", "cjs", "ts", "mts", "cts", "json"];
         // Detect if baseFilePath contains file extension
-        const possibleExtension = this.baseFilePath.substr(this.baseFilePath.lastIndexOf("."));
+        const possibleExtension = node_path_1.default.extname(this.baseFilePath);
         const fileExtension = fileFormats.find((extension) => `.${extension}` === possibleExtension);
         // try to find any of following configuration formats
-        const foundFileFormat = fileExtension ||
+        const foundFileFormat = fileExtension ??
             fileFormats.find((format) => {
                 return PlatformTools_1.PlatformTools.fileExist(this.baseFilePath + "." + format);
             });
@@ -93,6 +92,7 @@ class ConnectionOptionsReader {
     }
     /**
      * Normalize connection options.
+     *
      * @param connectionOptions
      */
     normalizeConnectionOptions(connectionOptions) {
@@ -102,9 +102,9 @@ class ConnectionOptionsReader {
             options.baseDirectory = this.baseDirectory;
             if (options.entities) {
                 const entities = options.entities.map((entity) => {
-                    if (typeof entity === "string" &&
-                        entity.substr(0, 1) !== "/")
+                    if (typeof entity === "string" && !entity.startsWith("/")) {
                         return this.baseDirectory + "/" + entity;
+                    }
                     return entity;
                 });
                 Object.assign(connectionOptions, { entities: entities });
@@ -112,8 +112,9 @@ class ConnectionOptionsReader {
             if (options.subscribers) {
                 const subscribers = options.subscribers.map((subscriber) => {
                     if (typeof subscriber === "string" &&
-                        subscriber.substr(0, 1) !== "/")
+                        !subscriber.startsWith("/")) {
                         return this.baseDirectory + "/" + subscriber;
+                    }
                     return subscriber;
                 });
                 Object.assign(connectionOptions, { subscribers: subscribers });
@@ -121,8 +122,9 @@ class ConnectionOptionsReader {
             if (options.migrations) {
                 const migrations = options.migrations.map((migration) => {
                     if (typeof migration === "string" &&
-                        migration.substr(0, 1) !== "/")
+                        !migration.startsWith("/")) {
                         return this.baseDirectory + "/" + migration;
+                    }
                     return migration;
                 });
                 Object.assign(connectionOptions, { migrations: migrations });
@@ -131,8 +133,8 @@ class ConnectionOptionsReader {
             if (options.type === "better-sqlite3") {
                 if (typeof options.database === "string" &&
                     !(0, PathUtils_1.isAbsolute)(options.database) &&
-                    options.database.substr(0, 1) !== "/" && // unix absolute
-                    options.database.substr(1, 2) !== ":\\" && // windows absolute
+                    !options.database.startsWith("/") && // unix absolute
+                    options.database.substring(1, 3) !== ":\\" && // windows absolute
                     options.database !== ":memory:") {
                     Object.assign(options, {
                         database: this.baseDirectory + "/" + options.database,
@@ -146,13 +148,13 @@ class ConnectionOptionsReader {
      * Gets directory where configuration file should be located and configuration file name.
      */
     get baseFilePath() {
-        return path_1.default.resolve(this.baseDirectory, this.baseConfigName);
+        return node_path_1.default.resolve(this.baseDirectory, this.baseConfigName);
     }
     /**
      * Gets directory where configuration file should be located.
      */
     get baseDirectory() {
-        return this.options?.root ?? app_root_path_1.default.path;
+        return this.options?.root ?? process.cwd();
     }
     /**
      * Gets configuration file name.

package/browser/connection/ConnectionOptionsReader.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionOptionsReader.js","sourceRoot":"../build/browser/src/","sources":["connection/ConnectionOptionsReader.ts"],"names":[],"mappings":"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","sourcesContent":["import appRootPath from \"app-root-path\"\nimport path from \"path\"\n\nimport type { DataSourceOptions } from \"../data-source/DataSourceOptions\"\nimport { TypeORMError } from \"../error\"\nimport { PlatformTools } from \"../platform/PlatformTools\"\nimport { importOrRequireFile } from \"../util/ImportUtils\"\nimport { isAbsolute } from \"../util/PathUtils\"\n\n/**\n * Reads connection options from the ormconfig.\n */\nexport class ConnectionOptionsReader {\n    // -------------------------------------------------------------------------\n    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(\n        protected options?: {\n            /**\n             * Directory where ormconfig should be read from.\n             * By default its your application root (where your app package.json is located).\n             */\n            root?: string\n\n            /**\n             * Filename of the ormconfig configuration. By default its equal to \"ormconfig\".\n             */\n            configName?: string\n        },\n    ) {}\n\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Returns all connection options read from the ormconfig.\n     */\n    async get(): Promise<DataSourceOptions[]> {\n        const options = await this.load()\n        if (!options)\n            throw new TypeORMError(\n                `No connection options were found in any orm configuration files.`,\n            )\n\n        return options\n    }\n\n    // -------------------------------------------------------------------------\n    // Protected Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Loads all connection options from a configuration file.\n     *\n     * todo: get in count NODE_ENV somehow\n     */\n    protected async load(): Promise<DataSourceOptions[] | undefined> {\n        let connectionOptions:\n            | DataSourceOptions\n            | DataSourceOptions[]\n            | undefined = undefined\n\n        const fileFormats = [\"js\", \"mjs\", \"cjs\", \"ts\", \"mts\", \"cts\", \"json\"]\n\n        // Detect if baseFilePath contains file extension\n        const possibleExtension = this.baseFilePath.substr(\n            this.baseFilePath.lastIndexOf(\".\"),\n        )\n        const fileExtension = fileFormats.find(\n            (extension) => `.${extension}` === possibleExtension,\n        )\n\n        // try to find any of following configuration formats\n        const foundFileFormat =\n            fileExtension ||\n            fileFormats.find((format) => {\n                return PlatformTools.fileExist(this.baseFilePath + \".\" + format)\n            })\n\n        // Determine config file name\n        const configFile = fileExtension\n            ? this.baseFilePath\n            : this.baseFilePath + \".\" + foundFileFormat\n\n        // try to find connection options from any of available sources of configuration\n        if (\n            foundFileFormat === \"js\" ||\n            foundFileFormat === \"mjs\" ||\n            foundFileFormat === \"cjs\" ||\n            foundFileFormat === \"ts\" ||\n            foundFileFormat === \"mts\" ||\n            foundFileFormat === \"cts\"\n        ) {\n            try {\n                const [importOrRequireResult, moduleSystem] =\n                    await importOrRequireFile(configFile)\n                const configModule = await importOrRequireResult\n\n                if (\n                    moduleSystem === \"esm\" ||\n                    (configModule &&\n                        \"__esModule\" in configModule &&\n                        \"default\" in configModule)\n                ) {\n                    connectionOptions = configModule.default\n                } else {\n                    connectionOptions = configModule\n                }\n            } catch (err) {\n                PlatformTools.logWarn(\n                    `Warning: Could not load ormconfig file at ${configFile}`,\n                    err instanceof Error ? err.message : String(err),\n                )\n            }\n        } else if (foundFileFormat === \"json\") {\n            try {\n                connectionOptions = require(configFile)\n            } catch (err) {\n                PlatformTools.logWarn(\n                    `Warning: Could not load ormconfig file at ${configFile}`,\n                    err instanceof Error ? err.message : String(err),\n                )\n            }\n        }\n\n        // normalize and return connection options\n        if (connectionOptions) {\n            return this.normalizeConnectionOptions(connectionOptions)\n        }\n\n        return undefined\n    }\n\n    /**\n     * Normalize connection options.\n     * @param connectionOptions\n     */\n    protected normalizeConnectionOptions(\n        connectionOptions: DataSourceOptions | DataSourceOptions[],\n    ): DataSourceOptions[] {\n        if (!Array.isArray(connectionOptions))\n            connectionOptions = [connectionOptions]\n\n        connectionOptions.forEach((options) => {\n            options.baseDirectory = this.baseDirectory\n            if (options.entities) {\n                const entities = (options.entities as any[]).map((entity) => {\n                    if (\n                        typeof entity === \"string\" &&\n                        entity.substr(0, 1) !== \"/\"\n                    )\n                        return this.baseDirectory + \"/\" + entity\n\n                    return entity\n                })\n                Object.assign(connectionOptions, { entities: entities })\n            }\n            if (options.subscribers) {\n                const subscribers = (options.subscribers as any[]).map(\n                    (subscriber) => {\n                        if (\n                            typeof subscriber === \"string\" &&\n                            subscriber.substr(0, 1) !== \"/\"\n                        )\n                            return this.baseDirectory + \"/\" + subscriber\n\n                        return subscriber\n                    },\n                )\n                Object.assign(connectionOptions, { subscribers: subscribers })\n            }\n            if (options.migrations) {\n                const migrations = (options.migrations as any[]).map(\n                    (migration) => {\n                        if (\n                            typeof migration === \"string\" &&\n                            migration.substr(0, 1) !== \"/\"\n                        )\n                            return this.baseDirectory + \"/\" + migration\n\n                        return migration\n                    },\n                )\n                Object.assign(connectionOptions, { migrations: migrations })\n            }\n\n            // make database path file in sqlite relative to package.json\n            if (options.type === \"better-sqlite3\") {\n                if (\n                    typeof options.database === \"string\" &&\n                    !isAbsolute(options.database) &&\n                    options.database.substr(0, 1) !== \"/\" && // unix absolute\n                    options.database.substr(1, 2) !== \":\\\\\" && // windows absolute\n                    options.database !== \":memory:\"\n                ) {\n                    Object.assign(options, {\n                        database: this.baseDirectory + \"/\" + options.database,\n                    })\n                }\n            }\n        })\n\n        return connectionOptions\n    }\n\n    /**\n     * Gets directory where configuration file should be located and configuration file name.\n     */\n    protected get baseFilePath(): string {\n        return path.resolve(this.baseDirectory, this.baseConfigName)\n    }\n\n    /**\n     * Gets directory where configuration file should be located.\n     */\n    protected get baseDirectory(): string {\n        return this.options?.root ?? appRootPath.path\n    }\n\n    /**\n     * Gets configuration file name.\n     */\n    protected get baseConfigName(): string {\n        return this.options?.configName ?? \"ormconfig\"\n    }\n}\n"]}
+{"version":3,"file":"ConnectionOptionsReader.js","sourceRoot":"../build/browser/src/","sources":["connection/ConnectionOptionsReader.ts"],"names":[],"mappings":"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","sourcesContent":["import path from \"node:path\"\n\nimport type { DataSourceOptions } from \"../data-source/DataSourceOptions\"\nimport { TypeORMError } from \"../error\"\nimport { PlatformTools } from \"../platform/PlatformTools\"\nimport { importOrRequireFile } from \"../util/ImportUtils\"\nimport { isAbsolute } from \"../util/PathUtils\"\n\n/**\n * Reads connection options from the ormconfig.\n */\nexport class ConnectionOptionsReader {\n    // -------------------------------------------------------------------------\n    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(\n        protected options?: {\n            /**\n             * Directory from where the `ormconfig` file should be read.\n             * Default: `process.cwd()`.\n             */\n            root?: string\n\n            /**\n             * Filename of the ormconfig configuration. By default its equal to \"ormconfig\".\n             */\n            configName?: string\n        },\n    ) {}\n\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Returns all connection options read from the ormconfig.\n     */\n    async get(): Promise<DataSourceOptions[]> {\n        const options = await this.load()\n        if (!options)\n            throw new TypeORMError(\n                `No connection options were found in any orm configuration files.`,\n            )\n\n        return options\n    }\n\n    // -------------------------------------------------------------------------\n    // Protected Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Loads all connection options from a configuration file.\n     *\n     * todo: get in count NODE_ENV somehow\n     */\n    protected async load(): Promise<DataSourceOptions[] | undefined> {\n        let connectionOptions:\n            | DataSourceOptions\n            | DataSourceOptions[]\n            | undefined = undefined\n\n        const fileFormats = [\"js\", \"mjs\", \"cjs\", \"ts\", \"mts\", \"cts\", \"json\"]\n\n        // Detect if baseFilePath contains file extension\n        const possibleExtension = path.extname(this.baseFilePath)\n        const fileExtension = fileFormats.find(\n            (extension) => `.${extension}` === possibleExtension,\n        )\n\n        // try to find any of following configuration formats\n        const foundFileFormat =\n            fileExtension ??\n            fileFormats.find((format) => {\n                return PlatformTools.fileExist(this.baseFilePath + \".\" + format)\n            })\n\n        // Determine config file name\n        const configFile = fileExtension\n            ? this.baseFilePath\n            : this.baseFilePath + \".\" + foundFileFormat\n\n        // try to find connection options from any of available sources of configuration\n        if (\n            foundFileFormat === \"js\" ||\n            foundFileFormat === \"mjs\" ||\n            foundFileFormat === \"cjs\" ||\n            foundFileFormat === \"ts\" ||\n            foundFileFormat === \"mts\" ||\n            foundFileFormat === \"cts\"\n        ) {\n            try {\n                const [importOrRequireResult, moduleSystem] =\n                    await importOrRequireFile(configFile)\n                const configModule = await importOrRequireResult\n\n                if (\n                    moduleSystem === \"esm\" ||\n                    (configModule &&\n                        \"__esModule\" in configModule &&\n                        \"default\" in configModule)\n                ) {\n                    connectionOptions = configModule.default\n                } else {\n                    connectionOptions = configModule\n                }\n            } catch (err) {\n                PlatformTools.logWarn(\n                    `Warning: Could not load ormconfig file at ${configFile}`,\n                    err instanceof Error ? err.message : String(err),\n                )\n            }\n        } else if (foundFileFormat === \"json\") {\n            try {\n                connectionOptions = require(configFile)\n            } catch (err) {\n                PlatformTools.logWarn(\n                    `Warning: Could not load ormconfig file at ${configFile}`,\n                    err instanceof Error ? err.message : String(err),\n                )\n            }\n        }\n\n        // normalize and return connection options\n        if (connectionOptions) {\n            return this.normalizeConnectionOptions(connectionOptions)\n        }\n\n        return undefined\n    }\n\n    /**\n     * Normalize connection options.\n     *\n     * @param connectionOptions\n     */\n    protected normalizeConnectionOptions(\n        connectionOptions: DataSourceOptions | DataSourceOptions[],\n    ): DataSourceOptions[] {\n        if (!Array.isArray(connectionOptions))\n            connectionOptions = [connectionOptions]\n\n        connectionOptions.forEach((options) => {\n            options.baseDirectory = this.baseDirectory\n            if (options.entities) {\n                const entities = (options.entities as any[]).map((entity) => {\n                    if (typeof entity === \"string\" && !entity.startsWith(\"/\")) {\n                        return this.baseDirectory + \"/\" + entity\n                    }\n\n                    return entity\n                })\n                Object.assign(connectionOptions, { entities: entities })\n            }\n            if (options.subscribers) {\n                const subscribers = (options.subscribers as any[]).map(\n                    (subscriber) => {\n                        if (\n                            typeof subscriber === \"string\" &&\n                            !subscriber.startsWith(\"/\")\n                        ) {\n                            return this.baseDirectory + \"/\" + subscriber\n                        }\n\n                        return subscriber\n                    },\n                )\n                Object.assign(connectionOptions, { subscribers: subscribers })\n            }\n            if (options.migrations) {\n                const migrations = (options.migrations as any[]).map(\n                    (migration) => {\n                        if (\n                            typeof migration === \"string\" &&\n                            !migration.startsWith(\"/\")\n                        ) {\n                            return this.baseDirectory + \"/\" + migration\n                        }\n\n                        return migration\n                    },\n                )\n                Object.assign(connectionOptions, { migrations: migrations })\n            }\n\n            // make database path file in sqlite relative to package.json\n            if (options.type === \"better-sqlite3\") {\n                if (\n                    typeof options.database === \"string\" &&\n                    !isAbsolute(options.database) &&\n                    !options.database.startsWith(\"/\") && // unix absolute\n                    options.database.substring(1, 3) !== \":\\\\\" && // windows absolute\n                    options.database !== \":memory:\"\n                ) {\n                    Object.assign(options, {\n                        database: this.baseDirectory + \"/\" + options.database,\n                    })\n                }\n            }\n        })\n\n        return connectionOptions\n    }\n\n    /**\n     * Gets directory where configuration file should be located and configuration file name.\n     */\n    protected get baseFilePath(): string {\n        return path.resolve(this.baseDirectory, this.baseConfigName)\n    }\n\n    /**\n     * Gets directory where configuration file should be located.\n     */\n    protected get baseDirectory(): string {\n        return this.options?.root ?? process.cwd()\n    }\n\n    /**\n     * Gets configuration file name.\n     */\n    protected get baseConfigName(): string {\n        return this.options?.configName ?? \"ormconfig\"\n    }\n}\n"]}

package/browser/data-source/BaseDataSourceOptions.d.ts

@@ -2,6 +2,7 @@ import type { EntitySchema } from "../entity-schema/EntitySchema";
 import type { LoggerOptions } from "../logger/LoggerOptions";
 import type { NamingStrategyInterface } from "../naming-strategy/NamingStrategyInterface";
 import type { DatabaseType } from "../driver/types/DatabaseType";
+import type { IsolationLevel } from "../driver/types/IsolationLevel";
 import type { Logger } from "../logger/Logger";
 import type { DataSource } from "../data-source/DataSource";
 import type { QueryResultCache } from "../cache/QueryResultCache";
@@ -26,6 +27,13 @@ export interface BaseDataSourceOptions {
      * Directories support glob patterns.
      */
     readonly subscribers?: MixedList<Function | string>;
+    /**
+     * Default isolation level for transactions. When set, all transactions started
+     * without an explicit level will use this value. An explicit isolation level
+     * passed to `transaction()` or `startTransaction()` overrides this default.
+     * Must be a level supported by the driver.
+     */
+    readonly isolationLevel?: IsolationLevel;
     /**
      * Migrations to be loaded for this connection.
      * Accepts both migration classes and glob patterns representing migration files.

package/browser/data-source/BaseDataSourceOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseDataSourceOptions.js","sourceRoot":"../build/browser/src/","sources":["data-source/BaseDataSourceOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { EntitySchema } from \"../entity-schema/EntitySchema\"\nimport type { LoggerOptions } from \"../logger/LoggerOptions\"\nimport type { NamingStrategyInterface } from \"../naming-strategy/NamingStrategyInterface\"\nimport type { DatabaseType } from \"../driver/types/DatabaseType\"\nimport type { Logger } from \"../logger/Logger\"\nimport type { DataSource } from \"../data-source/DataSource\"\nimport type { QueryResultCache } from \"../cache/QueryResultCache\"\nimport type { MixedList } from \"../common/MixedList\"\n\n/**\n * BaseDataSourceOptions is set of DataSourceOptions shared by all database types.\n */\nexport interface BaseDataSourceOptions {\n    /**\n     * Database type. This value is required.\n     */\n    readonly type: DatabaseType\n\n    /**\n     * Entities to be loaded for this connection.\n     * Accepts both entity classes and directories where from entities need to be loaded.\n     * Directories support glob patterns.\n     */\n    readonly entities?: MixedList<Function | string | EntitySchema>\n\n    /**\n     * Subscribers to be loaded for this connection.\n     * Accepts both subscriber classes and directories where from subscribers need to be loaded.\n     * Directories support glob patterns.\n     */\n    readonly subscribers?: MixedList<Function | string>\n\n    /**\n     * Migrations to be loaded for this connection.\n     * Accepts both migration classes and glob patterns representing migration files.\n     */\n    readonly migrations?: MixedList<Function | string>\n\n    /**\n     * Migrations table name, in case of different name from \"migrations\".\n     * Accepts single string name.\n     */\n    readonly migrationsTableName?: string\n\n    /**\n     * Transaction mode for migrations to run in\n     */\n    readonly migrationsTransactionMode?: \"all\" | \"none\" | \"each\"\n\n    /**\n     * Typeorm metadata table name, in case of different name from \"typeorm_metadata\".\n     * Accepts single string name.\n     */\n    readonly metadataTableName?: string\n\n    /**\n     * Naming strategy to be used to name tables and columns in the database.\n     */\n    readonly namingStrategy?: NamingStrategyInterface\n\n    /**\n     * Logging options.\n     */\n    readonly logging?: LoggerOptions\n\n    /**\n     * Logger instance used to log queries and events in the ORM.\n     */\n    readonly logger?:\n        | \"advanced-console\"\n        | \"simple-console\"\n        | \"formatted-console\"\n        | \"file\"\n        | \"debug\"\n        | Logger\n\n    /**\n     * Maximum number of milliseconds query should be executed before logger log a warning.\n     */\n    readonly maxQueryExecutionTime?: number\n\n    /**\n     * Maximum number of clients the pool should contain.\n     */\n    readonly poolSize?: number\n\n    /**\n     * Indicates if database schema should be auto created on every application launch.\n     * Be careful with this option and don't use this in production - otherwise you can lose production data.\n     * This option is useful during debug and development.\n     * Alternative to it, you can use CLI and run schema:sync command.\n     *\n     * Note that for MongoDB database it does not create schema, because MongoDB is schemaless.\n     * Instead, it syncs just by creating indices.\n     */\n    readonly synchronize?: boolean\n\n    /**\n     * Indicates if migrations should be auto run on every application launch.\n     * Alternative to it, you can use CLI and run migrations:run command.\n     */\n    readonly migrationsRun?: boolean\n\n    /**\n     * Drops the schema each time connection is being established.\n     * Be careful with this option and don't use this in production - otherwise you'll lose all production data.\n     * This option is useful during debug and development.\n     */\n    readonly dropSchema?: boolean\n\n    /**\n     * Prefix to use on all tables (collections) of this connection in the database.\n     */\n    readonly entityPrefix?: string\n\n    /**\n     * When creating new Entity instances, skip all constructors when true.\n     */\n    readonly entitySkipConstructor?: boolean\n\n    /**\n     * Extra connection options to be passed to the underlying driver.\n     *\n     * todo: deprecate this and move all database-specific types into hts own connection options object.\n     */\n    readonly extra?: any\n\n    /**\n     * Specifies how relations must be loaded - using \"joins\" or separate queries.\n     * If you are loading too much data with nested joins it's better to load relations\n     * using separate queries.\n     *\n     * Default strategy is \"join\", but this default can be changed here.\n     * Also, strategy can be set per-query in FindOptions and QueryBuilder.\n     */\n    readonly relationLoadStrategy?: \"join\" | \"query\"\n\n    /**\n     * Optionally applied \"typename\" to the model.\n     * If set, then each hydrated model will have this property with the target model / entity name inside.\n     *\n     * (works like a discriminator property).\n     */\n    readonly typename?: string\n\n    /**\n     * Holds reference to the baseDirectory where configuration file are expected.\n     * @internal\n     */\n    baseDirectory?: string\n\n    /**\n     * Allows to setup cache options.\n     */\n    readonly cache?:\n        | boolean\n        | {\n              /**\n               * Type of caching.\n               *\n               * - \"database\" means cached values will be stored in the separate table in database. This is default value.\n               * - \"redis\" means cached values will be stored inside redis. You must provide redis connection options.\n               */\n              readonly type?:\n                  | \"database\"\n                  | \"redis\"\n                  | \"ioredis\"\n                  | \"ioredis/cluster\" // todo: add mongodb and other cache providers as well in the future\n\n              /**\n               * Factory function for custom cache providers that implement QueryResultCache.\n               */\n              readonly provider?: (dataSource: DataSource) => QueryResultCache\n\n              /**\n               * Configurable table name for \"database\" type cache.\n               * Default value is \"query-result-cache\"\n               */\n              readonly tableName?: string\n\n              /**\n               * Used to provide redis connection options.\n               */\n              readonly options?: any\n\n              /**\n               * If set to true then queries (using find methods and QueryBuilder's methods) will always be cached.\n               */\n              readonly alwaysEnabled?: boolean\n\n              /**\n               * Time in milliseconds in which cache will expire.\n               * This can be setup per-query.\n               * Default value is 1000 which is equivalent to 1 second.\n               */\n              readonly duration?: number\n\n              /**\n               * Used to specify if cache errors should be ignored, and pass through the call to the Database.\n               */\n              readonly ignoreErrors?: boolean\n          }\n\n    /**\n     * Allows automatic isolation of where clauses\n     */\n    readonly isolateWhereStatements?: boolean\n\n    /**\n     * Controls how null and undefined values are handled in find operations.\n     */\n    readonly invalidWhereValuesBehavior?: {\n        /**\n         * How to handle null values in where conditions.\n         * - 'ignore': Skip null properties\n         * - 'sql-null': Transform null to SQL NULL\n         * - 'throw': Throw an error when null is encountered (default)\n         */\n        readonly null?: \"ignore\" | \"sql-null\" | \"throw\"\n\n        /**\n         * How to handle undefined values in where conditions.\n         * - 'ignore': Skip undefined properties\n         * - 'throw': Throw an error when undefined is encountered (default)\n         */\n        readonly undefined?: \"ignore\" | \"throw\"\n    }\n}\n"]}
+{"version":3,"file":"BaseDataSourceOptions.js","sourceRoot":"../build/browser/src/","sources":["data-source/BaseDataSourceOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { EntitySchema } from \"../entity-schema/EntitySchema\"\nimport type { LoggerOptions } from \"../logger/LoggerOptions\"\nimport type { NamingStrategyInterface } from \"../naming-strategy/NamingStrategyInterface\"\nimport type { DatabaseType } from \"../driver/types/DatabaseType\"\nimport type { IsolationLevel } from \"../driver/types/IsolationLevel\"\nimport type { Logger } from \"../logger/Logger\"\nimport type { DataSource } from \"../data-source/DataSource\"\nimport type { QueryResultCache } from \"../cache/QueryResultCache\"\nimport type { MixedList } from \"../common/MixedList\"\n\n/**\n * BaseDataSourceOptions is set of DataSourceOptions shared by all database types.\n */\nexport interface BaseDataSourceOptions {\n    /**\n     * Database type. This value is required.\n     */\n    readonly type: DatabaseType\n\n    /**\n     * Entities to be loaded for this connection.\n     * Accepts both entity classes and directories where from entities need to be loaded.\n     * Directories support glob patterns.\n     */\n    readonly entities?: MixedList<Function | string | EntitySchema>\n\n    /**\n     * Subscribers to be loaded for this connection.\n     * Accepts both subscriber classes and directories where from subscribers need to be loaded.\n     * Directories support glob patterns.\n     */\n    readonly subscribers?: MixedList<Function | string>\n\n    /**\n     * Default isolation level for transactions. When set, all transactions started\n     * without an explicit level will use this value. An explicit isolation level\n     * passed to `transaction()` or `startTransaction()` overrides this default.\n     * Must be a level supported by the driver.\n     */\n    readonly isolationLevel?: IsolationLevel\n\n    /**\n     * Migrations to be loaded for this connection.\n     * Accepts both migration classes and glob patterns representing migration files.\n     */\n    readonly migrations?: MixedList<Function | string>\n\n    /**\n     * Migrations table name, in case of different name from \"migrations\".\n     * Accepts single string name.\n     */\n    readonly migrationsTableName?: string\n\n    /**\n     * Transaction mode for migrations to run in\n     */\n    readonly migrationsTransactionMode?: \"all\" | \"none\" | \"each\"\n\n    /**\n     * Typeorm metadata table name, in case of different name from \"typeorm_metadata\".\n     * Accepts single string name.\n     */\n    readonly metadataTableName?: string\n\n    /**\n     * Naming strategy to be used to name tables and columns in the database.\n     */\n    readonly namingStrategy?: NamingStrategyInterface\n\n    /**\n     * Logging options.\n     */\n    readonly logging?: LoggerOptions\n\n    /**\n     * Logger instance used to log queries and events in the ORM.\n     */\n    readonly logger?:\n        | \"advanced-console\"\n        | \"simple-console\"\n        | \"formatted-console\"\n        | \"file\"\n        | \"debug\"\n        | Logger\n\n    /**\n     * Maximum number of milliseconds query should be executed before logger log a warning.\n     */\n    readonly maxQueryExecutionTime?: number\n\n    /**\n     * Maximum number of clients the pool should contain.\n     */\n    readonly poolSize?: number\n\n    /**\n     * Indicates if database schema should be auto created on every application launch.\n     * Be careful with this option and don't use this in production - otherwise you can lose production data.\n     * This option is useful during debug and development.\n     * Alternative to it, you can use CLI and run schema:sync command.\n     *\n     * Note that for MongoDB database it does not create schema, because MongoDB is schemaless.\n     * Instead, it syncs just by creating indices.\n     */\n    readonly synchronize?: boolean\n\n    /**\n     * Indicates if migrations should be auto run on every application launch.\n     * Alternative to it, you can use CLI and run migrations:run command.\n     */\n    readonly migrationsRun?: boolean\n\n    /**\n     * Drops the schema each time connection is being established.\n     * Be careful with this option and don't use this in production - otherwise you'll lose all production data.\n     * This option is useful during debug and development.\n     */\n    readonly dropSchema?: boolean\n\n    /**\n     * Prefix to use on all tables (collections) of this connection in the database.\n     */\n    readonly entityPrefix?: string\n\n    /**\n     * When creating new Entity instances, skip all constructors when true.\n     */\n    readonly entitySkipConstructor?: boolean\n\n    /**\n     * Extra connection options to be passed to the underlying driver.\n     *\n     * todo: deprecate this and move all database-specific types into hts own connection options object.\n     */\n    readonly extra?: any\n\n    /**\n     * Specifies how relations must be loaded - using \"joins\" or separate queries.\n     * If you are loading too much data with nested joins it's better to load relations\n     * using separate queries.\n     *\n     * Default strategy is \"join\", but this default can be changed here.\n     * Also, strategy can be set per-query in FindOptions and QueryBuilder.\n     */\n    readonly relationLoadStrategy?: \"join\" | \"query\"\n\n    /**\n     * Optionally applied \"typename\" to the model.\n     * If set, then each hydrated model will have this property with the target model / entity name inside.\n     *\n     * (works like a discriminator property).\n     */\n    readonly typename?: string\n\n    /**\n     * Holds reference to the baseDirectory where configuration file are expected.\n     *\n     * @internal\n     */\n    baseDirectory?: string\n\n    /**\n     * Allows to setup cache options.\n     */\n    readonly cache?:\n        | boolean\n        | {\n              /**\n               * Type of caching.\n               *\n               * - \"database\" means cached values will be stored in the separate table in database. This is default value.\n               * - \"redis\" means cached values will be stored inside redis. You must provide redis connection options.\n               */\n              readonly type?:\n                  | \"database\"\n                  | \"redis\"\n                  | \"ioredis\"\n                  | \"ioredis/cluster\" // todo: add mongodb and other cache providers as well in the future\n\n              /**\n               * Factory function for custom cache providers that implement QueryResultCache.\n               */\n              readonly provider?: (dataSource: DataSource) => QueryResultCache\n\n              /**\n               * Configurable table name for \"database\" type cache.\n               * Default value is \"query-result-cache\"\n               */\n              readonly tableName?: string\n\n              /**\n               * Used to provide redis connection options.\n               */\n              readonly options?: any\n\n              /**\n               * If set to true then queries (using find methods and QueryBuilder's methods) will always be cached.\n               */\n              readonly alwaysEnabled?: boolean\n\n              /**\n               * Time in milliseconds in which cache will expire.\n               * This can be setup per-query.\n               * Default value is 1000 which is equivalent to 1 second.\n               */\n              readonly duration?: number\n\n              /**\n               * Used to specify if cache errors should be ignored, and pass through the call to the Database.\n               */\n              readonly ignoreErrors?: boolean\n          }\n\n    /**\n     * Allows automatic isolation of where clauses\n     */\n    readonly isolateWhereStatements?: boolean\n\n    /**\n     * Controls how null and undefined values are handled in find operations.\n     */\n    readonly invalidWhereValuesBehavior?: {\n        /**\n         * How to handle null values in where conditions.\n         * - 'ignore': Skip null properties\n         * - 'sql-null': Transform null to SQL NULL\n         * - 'throw': Throw an error when null is encountered (default)\n         */\n        readonly null?: \"ignore\" | \"sql-null\" | \"throw\"\n\n        /**\n         * How to handle undefined values in where conditions.\n         * - 'ignore': Skip undefined properties\n         * - 'throw': Throw an error when undefined is encountered (default)\n         */\n        readonly undefined?: \"ignore\" | \"throw\"\n    }\n}\n"]}

package/browser/data-source/DataSource.d.ts

@@ -91,6 +91,7 @@ export declare class DataSource {
      * with any entity in this connection.
      *
      * Available only in mongodb connections.
+     *
      * @returns the mongodb entity manager
      */
     get mongoManager(): MongoEntityManager;
@@ -98,11 +99,13 @@ export declare class DataSource {
      * Gets a sql.js specific Entity Manager that allows to perform special load and save operations
      *
      * Available only in connection with the sqljs driver.
+     *
      * @returns an sqljs specific Entity Manager
      */
     get sqljsManager(): SqljsEntityManager;
     /**
      * Updates current connection options with provided options.
+     *
      * @param options
      */
     setOptions(options: Partial<DataSourceOptions>): this;
@@ -121,6 +124,7 @@ export declare class DataSource {
     /**
      * Creates database schema for all entities registered in this connection.
      * Can be used only after connection to the database is established.
+     *
      * @param dropBeforeSync If set to true then it drops the database with all its tables and data
      */
     synchronize(dropBeforeSync?: boolean): Promise<void>;
@@ -133,6 +137,7 @@ export declare class DataSource {
     /**
      * Runs all pending migrations.
      * Can be used only after connection to the database is established.
+     *
      * @param options
      * @param options.transaction
      * @param options.fake
@@ -144,6 +149,7 @@ export declare class DataSource {
     /**
      * Reverts last executed migration.
      * Can be used only after connection to the database is established.
+     *
      * @param options
      * @param options.transaction
      * @param options.fake
@@ -159,28 +165,33 @@ export declare class DataSource {
     showMigrations(): Promise<boolean>;
     /**
      * Checks if entity metadata exist for the given entity class, target name or table name.
+     *
      * @param target
      */
     hasMetadata(target: EntityTarget<any>): boolean;
     /**
      * Gets entity metadata for the given entity class or schema name.
+     *
      * @param target
      */
     getMetadata(target: EntityTarget<any>): EntityMetadata;
     /**
      * Gets repository for the given entity.
+     *
      * @param target
      */
     getRepository<Entity extends ObjectLiteral>(target: EntityTarget<Entity>): Repository<Entity>;
     /**
      * Gets tree repository for the given entity class or name.
      * Only tree-type entities can have a TreeRepository, like ones decorated with `@Tree` decorator.
+     *
      * @param target
      */
     getTreeRepository<Entity extends ObjectLiteral>(target: EntityTarget<Entity>): TreeRepository<Entity>;
     /**
      * Gets mongodb-specific repository for the given entity class or name.
      * Works only if connection is mongodb-specific.
+     *
      * @param target
      */
     getMongoRepository<Entity extends ObjectLiteral>(target: EntityTarget<Entity>): MongoRepository<Entity>;
@@ -192,6 +203,7 @@ export declare class DataSource {
     transaction<T>(isolationLevel: IsolationLevel, runInTransaction: (entityManager: EntityManager) => Promise<T>): Promise<T>;
     /**
      * Executes raw SQL query and returns raw database results.
+     *
      * @param query
      * @param parameters
      * @param queryRunner
@@ -204,7 +216,10 @@ export declare class DataSource {
      * Template expressions are automatically transformed into database parameters.
      * Raw query execution is supported only by relational databases (MongoDB is not supported).
      * Note: Don't call this as a regular function, it is meant to be used with backticks to tag a template literal.
-     * Example: dataSource.sql`SELECT * FROM table_name WHERE id = ${id}`
+     *
+     * @example
+     * dataSource.sql`SELECT * FROM table_name WHERE id = ${id}`
+     *
      * @param strings
      * @param values
      * @returns a raw response from the database client
@@ -227,22 +242,26 @@ export declare class DataSource {
      * to master database or any of slave databases.
      * If you perform writes you must use master database,
      * if you perform reads you can use slave databases.
+     *
      * @param mode
      */
     createQueryRunner(mode?: ReplicationMode): QueryRunner;
     /**
      * Gets entity metadata of the junction table (many-to-many table).
+     *
      * @param entityTarget
      * @param relationPropertyPath
      */
     getManyToManyMetadata(entityTarget: EntityTarget<any>, relationPropertyPath: string): EntityMetadata | undefined;
     /**
      * Creates an Entity Manager for the current connection with the help of the EntityManagerFactory.
+     *
      * @param queryRunner
      */
     createEntityManager(queryRunner?: QueryRunner): EntityManager;
     /**
      * Finds exist entity metadata by the given entity class, target name or table name.
+     *
      * @param target
      */
     protected findMetadata(target: EntityTarget<any>): EntityMetadata | undefined;

package/browser/data-source/DataSource.js

@@ -14,6 +14,7 @@ const LoggerFactory_1 = require("../logger/LoggerFactory");
 const QueryResultCacheFactory_1 = require("../cache/QueryResultCacheFactory");
 const RelationLoader_1 = require("../query-builder/RelationLoader");
 const ObjectUtils_1 = require("../util/ObjectUtils");
+const validate_isolation_level_1 = require("../driver/validate-isolation-level");
 const RelationIdLoader_1 = require("../query-builder/RelationIdLoader");
 const DriverUtils_1 = require("../driver/DriverUtils");
 const InstanceChecker_1 = require("../util/InstanceChecker");
@@ -56,8 +57,8 @@ class DataSource {
         this.driver = new DriverFactory_1.DriverFactory().create(this);
         this.manager = this.createEntityManager();
         this.namingStrategy =
-            options.namingStrategy || new DefaultNamingStrategy_1.DefaultNamingStrategy();
-        this.metadataTableName = options.metadataTableName || "typeorm_metadata";
+            options.namingStrategy ?? new DefaultNamingStrategy_1.DefaultNamingStrategy();
+        this.metadataTableName = options.metadataTableName ?? "typeorm_metadata";
         this.queryResultCache = options.cache
             ? new QueryResultCacheFactory_1.QueryResultCacheFactory(this).create()
             : undefined;
@@ -73,6 +74,7 @@ class DataSource {
      * with any entity in this connection.
      *
      * Available only in mongodb connections.
+     *
      * @returns the mongodb entity manager
      */
     get mongoManager() {
@@ -84,6 +86,7 @@ class DataSource {
      * Gets a sql.js specific Entity Manager that allows to perform special load and save operations
      *
      * Available only in connection with the sqljs driver.
+     *
      * @returns an sqljs specific Entity Manager
      */
     get sqljsManager() {
@@ -96,12 +99,13 @@ class DataSource {
     // -------------------------------------------------------------------------
     /**
      * Updates current connection options with provided options.
+     *
      * @param options
      */
     setOptions(options) {
         Object.assign(this.options, options);
         if (options.logger || options.logging) {
-            this.logger = new LoggerFactory_1.LoggerFactory().create(options.logger || this.options.logger, options.logging || this.options.logging);
+            this.logger = new LoggerFactory_1.LoggerFactory().create(options.logger ?? this.options.logger, options.logging ?? this.options.logging);
         }
         if (options.namingStrategy) {
             this.namingStrategy = options.namingStrategy;
@@ -127,6 +131,8 @@ class DataSource {
     async initialize() {
         if (this.isInitialized)
             throw new error_1.CannotConnectAlreadyConnectedError();
+        // validate isolationLevel before connecting
+        (0, validate_isolation_level_1.validateIsolationLevel)(this.driver.supportedIsolationLevels, this.options.isolationLevel);
         // connect to the database via its driver
         await this.driver.connect();
         // connect to the cache-specific database if cache is enabled
@@ -174,6 +180,7 @@ class DataSource {
     /**
      * Creates database schema for all entities registered in this connection.
      * Can be used only after connection to the database is established.
+     *
      * @param dropBeforeSync If set to true then it drops the database with all its tables and data
      */
     async synchronize(dropBeforeSync = false) {
@@ -226,6 +233,7 @@ class DataSource {
     /**
      * Runs all pending migrations.
      * Can be used only after connection to the database is established.
+     *
      * @param options
      * @param options.transaction
      * @param options.fake
@@ -235,16 +243,17 @@ class DataSource {
             throw new error_1.CannotExecuteNotConnectedError();
         const migrationExecutor = new MigrationExecutor_1.MigrationExecutor(this);
         migrationExecutor.transaction =
-            options?.transaction ||
-                this.options?.migrationsTransactionMode ||
+            options?.transaction ??
+                this.options?.migrationsTransactionMode ??
                 "all";
-        migrationExecutor.fake = (options && options.fake) || false;
+        migrationExecutor.fake = options?.fake ?? false;
         const successMigrations = await migrationExecutor.executePendingMigrations();
         return successMigrations;
     }
     /**
      * Reverts last executed migration.
      * Can be used only after connection to the database is established.
+     *
      * @param options
      * @param options.transaction
      * @param options.fake
@@ -253,9 +262,8 @@ class DataSource {
         if (!this.isInitialized)
             throw new error_1.CannotExecuteNotConnectedError();
         const migrationExecutor = new MigrationExecutor_1.MigrationExecutor(this);
-        migrationExecutor.transaction =
-            (options && options.transaction) || "all";
-        migrationExecutor.fake = (options && options.fake) || false;
+        migrationExecutor.transaction = options?.transaction ?? "all";
+        migrationExecutor.fake = options?.fake ?? false;
         await migrationExecutor.undoLastMigration();
     }
     /**
@@ -271,6 +279,7 @@ class DataSource {
     }
     /**
      * Checks if entity metadata exist for the given entity class, target name or table name.
+     *
      * @param target
      */
     hasMetadata(target) {
@@ -278,6 +287,7 @@ class DataSource {
     }
     /**
      * Gets entity metadata for the given entity class or schema name.
+     *
      * @param target
      */
     getMetadata(target) {
@@ -288,6 +298,7 @@ class DataSource {
     }
     /**
      * Gets repository for the given entity.
+     *
      * @param target
      */
     getRepository(target) {
@@ -296,6 +307,7 @@ class DataSource {
     /**
      * Gets tree repository for the given entity class or name.
      * Only tree-type entities can have a TreeRepository, like ones decorated with `@Tree` decorator.
+     *
      * @param target
      */
     getTreeRepository(target) {
@@ -304,6 +316,7 @@ class DataSource {
     /**
      * Gets mongodb-specific repository for the given entity class or name.
      * Works only if connection is mongodb-specific.
+     *
      * @param target
      */
     getMongoRepository(target) {
@@ -316,6 +329,7 @@ class DataSource {
     }
     /**
      * Executes raw SQL query and returns raw database results.
+     *
      * @param query
      * @param parameters
      * @param queryRunner
@@ -325,9 +339,9 @@ class DataSource {
     async query(query, parameters, queryRunner) {
         if (InstanceChecker_1.InstanceChecker.isMongoEntityManager(this.manager))
             throw new error_1.TypeORMError(`Queries aren't supported by MongoDB.`);
-        if (queryRunner && queryRunner.isReleased)
+        if (queryRunner?.isReleased)
             throw new error_1.QueryRunnerProviderAlreadyReleasedError();
-        const usedQueryRunner = queryRunner || this.createQueryRunner();
+        const usedQueryRunner = queryRunner ?? this.createQueryRunner();
         try {
             return await usedQueryRunner.query(query, parameters); // await is needed here because we are using finally
         }
@@ -341,7 +355,10 @@ class DataSource {
      * Template expressions are automatically transformed into database parameters.
      * Raw query execution is supported only by relational databases (MongoDB is not supported).
      * Note: Don't call this as a regular function, it is meant to be used with backticks to tag a template literal.
-     * Example: dataSource.sql`SELECT * FROM table_name WHERE id = ${id}`
+     *
+     * @example
+     * dataSource.sql`SELECT * FROM table_name WHERE id = ${id}`
+     *
      * @param strings
      * @param values
      * @returns a raw response from the database client
@@ -356,6 +373,7 @@ class DataSource {
     }
     /**
      * Creates a new query builder that can be used to build a SQL query.
+     *
      * @param entityOrRunner
      * @param alias
      * @param queryRunner
@@ -383,6 +401,7 @@ class DataSource {
      * to master database or any of slave databases.
      * If you perform writes you must use master database,
      * if you perform reads you can use slave databases.
+     *
      * @param mode
      */
     createQueryRunner(mode = "master") {
@@ -393,6 +412,7 @@ class DataSource {
     }
     /**
      * Gets entity metadata of the junction table (many-to-many table).
+     *
      * @param entityTarget
      * @param relationPropertyPath
      */
@@ -407,6 +427,7 @@ class DataSource {
     }
     /**
      * Creates an Entity Manager for the current connection with the help of the EntityManagerFactory.
+     *
      * @param queryRunner
      */
     createEntityManager(queryRunner) {
@@ -417,6 +438,7 @@ class DataSource {
     // -------------------------------------------------------------------------
     /**
      * Finds exist entity metadata by the given entity class, target name or table name.
+     *
      * @param target
      */
     findMetadata(target) {
@@ -465,18 +487,18 @@ class DataSource {
         const connectionMetadataBuilder = new ConnectionMetadataBuilder_1.ConnectionMetadataBuilder(this);
         const entityMetadataValidator = new EntityMetadataValidator_1.EntityMetadataValidator();
         // create subscribers instances if they are not disallowed from high-level (for example they can disallowed from migrations run process)
-        const flattenedSubscribers = ObjectUtils_1.ObjectUtils.mixedListToArray(this.options.subscribers || []);
+        const flattenedSubscribers = ObjectUtils_1.ObjectUtils.mixedListToArray(this.options.subscribers ?? []);
         const subscribers = await connectionMetadataBuilder.buildSubscribers(flattenedSubscribers);
         ObjectUtils_1.ObjectUtils.assign(this, { subscribers: subscribers });
         // build entity metadatas
-        const flattenedEntities = ObjectUtils_1.ObjectUtils.mixedListToArray(this.options.entities || []);
+        const flattenedEntities = ObjectUtils_1.ObjectUtils.mixedListToArray(this.options.entities ?? []);
         const entityMetadatas = await connectionMetadataBuilder.buildEntityMetadatas(flattenedEntities);
         ObjectUtils_1.ObjectUtils.assign(this, {
             entityMetadatas: entityMetadatas,
             entityMetadatasMap: new Map(entityMetadatas.map((metadata) => [metadata.target, metadata])),
         });
         // create migration instances
-        const flattenedMigrations = ObjectUtils_1.ObjectUtils.mixedListToArray(this.options.migrations || []);
+        const flattenedMigrations = ObjectUtils_1.ObjectUtils.mixedListToArray(this.options.migrations ?? []);
         const migrations = await connectionMetadataBuilder.buildMigrations(flattenedMigrations);
         ObjectUtils_1.ObjectUtils.assign(this, { migrations: migrations });
         // validate all created entity metadatas to make sure user created entities are valid and correct