@nest-boot/mikro-orm 7.7.1 → 7.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/mikro-orm.module.d.ts +3 -0
- package/dist/mikro-orm.module.js +20 -1
- package/dist/mikro-orm.module.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/utils/load-config-from-env.util.d.ts +16 -6
- package/dist/utils/load-config-from-env.util.js +196 -53
- package/dist/utils/load-config-from-env.util.js.map +1 -1
- package/dist/utils/load-config-from-env.util.spec.js +244 -17
- package/dist/utils/load-config-from-env.util.spec.js.map +1 -1
- package/dist/utils/load-default-config.util.d.ts +23 -0
- package/dist/utils/load-default-config.util.js +29 -0
- package/dist/utils/load-default-config.util.js.map +1 -0
- package/package.json +6 -5
|
@@ -8,6 +8,9 @@ import { ASYNC_OPTIONS_TYPE, ConfigurableModuleClass, OPTIONS_TYPE } from "./mik
|
|
|
8
8
|
* @remarks
|
|
9
9
|
* Wraps `@mikro-orm/nestjs` with automatic environment-based configuration
|
|
10
10
|
* and request context integration for per-request entity manager forking.
|
|
11
|
+
* Automatic `DATABASE_URL` loading is skipped when an explicit URL or
|
|
12
|
+
* host-style connection target is registered, so ambient connection fields
|
|
13
|
+
* cannot be merged into it.
|
|
11
14
|
*/
|
|
12
15
|
export declare class MikroOrmModule extends ConfigurableModuleClass implements OnModuleInit {
|
|
13
16
|
private readonly orm;
|
package/dist/mikro-orm.module.js
CHANGED
|
@@ -16,12 +16,28 @@ const request_context_1 = require("@nest-boot/request-context");
|
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const mikro_orm_module_definition_1 = require("./mikro-orm.module-definition");
|
|
18
18
|
const load_config_from_env_util_1 = require("./utils/load-config-from-env.util");
|
|
19
|
+
const load_default_config_util_1 = require("./utils/load-default-config.util");
|
|
20
|
+
const CONNECTION_TARGET_OPTION_KEYS = [
|
|
21
|
+
"dbName",
|
|
22
|
+
"clientUrl",
|
|
23
|
+
"host",
|
|
24
|
+
"port",
|
|
25
|
+
"user",
|
|
26
|
+
"password",
|
|
27
|
+
"replicas",
|
|
28
|
+
];
|
|
29
|
+
function hasExplicitConnectionTarget(options) {
|
|
30
|
+
return CONNECTION_TARGET_OPTION_KEYS.some((key) => options[key] !== undefined);
|
|
31
|
+
}
|
|
19
32
|
/**
|
|
20
33
|
* MikroORM integration module with request-scoped entity manager.
|
|
21
34
|
*
|
|
22
35
|
* @remarks
|
|
23
36
|
* Wraps `@mikro-orm/nestjs` with automatic environment-based configuration
|
|
24
37
|
* and request context integration for per-request entity manager forking.
|
|
38
|
+
* Automatic `DATABASE_URL` loading is skipped when an explicit URL or
|
|
39
|
+
* host-style connection target is registered, so ambient connection fields
|
|
40
|
+
* cannot be merged into it.
|
|
25
41
|
*/
|
|
26
42
|
let MikroOrmModule = class MikroOrmModule extends mikro_orm_module_definition_1.ConfigurableModuleClass {
|
|
27
43
|
/**
|
|
@@ -89,6 +105,9 @@ exports.MikroOrmModule = MikroOrmModule = __decorate([
|
|
|
89
105
|
inject: [mikro_orm_module_definition_1.MODULE_OPTIONS_TOKEN],
|
|
90
106
|
useFactory: async (options) => {
|
|
91
107
|
const logger = new common_1.Logger("MikroORM");
|
|
108
|
+
const envOptions = hasExplicitConnectionTarget(options)
|
|
109
|
+
? (0, load_default_config_util_1.loadDefaultConfig)()
|
|
110
|
+
: await (0, load_config_from_env_util_1.loadConfigFromEnv)();
|
|
92
111
|
return {
|
|
93
112
|
registerRequestContext: false,
|
|
94
113
|
context: () => {
|
|
@@ -99,7 +118,7 @@ exports.MikroOrmModule = MikroOrmModule = __decorate([
|
|
|
99
118
|
logger: (msg) => {
|
|
100
119
|
logger.log(msg);
|
|
101
120
|
},
|
|
102
|
-
...
|
|
121
|
+
...envOptions,
|
|
103
122
|
...options,
|
|
104
123
|
};
|
|
105
124
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mikro-orm.module.js","sourceRoot":"","sources":["../src/mikro-orm.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAA0D;AAC1D,8CAAyE;AACzE,gEAGoC;AACpC,2CAMwB;AAGxB,+EAMuC;AACvC,iFAAsE;
|
|
1
|
+
{"version":3,"file":"mikro-orm.module.js","sourceRoot":"","sources":["../src/mikro-orm.module.ts"],"names":[],"mappings":"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"}
|