@celljs/typeorm 4.5.0 → 4.6.0
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/esm/common/typeorm-initializer.js +1 -1
- package/esm/common/typeorm-initializer.js.map +1 -1
- package/esm/common/utils.d.ts +4 -2
- package/esm/common/utils.js +3 -6
- package/esm/common/utils.js.map +1 -1
- package/esm/node/annotation/transactional.js +5 -2
- package/esm/node/annotation/transactional.js.map +1 -1
- package/lib/common/typeorm-initializer.js +1 -1
- package/lib/common/typeorm-initializer.js.map +1 -1
- package/lib/common/utils.d.ts +4 -2
- package/lib/common/utils.d.ts.map +1 -1
- package/lib/common/utils.js +3 -6
- package/lib/common/utils.js.map +1 -1
- package/lib/node/annotation/transactional.d.ts.map +1 -1
- package/lib/node/annotation/transactional.js +4 -1
- package/lib/node/annotation/transactional.js.map +1 -1
- package/lib/package.spec.js +15 -2
- package/lib/package.spec.js.map +1 -1
- package/package.json +3 -3
- package/src/common/typeorm-initializer.ts +1 -1
- package/src/common/utils.ts +4 -6
- package/src/node/annotation/transactional.ts +5 -2
- package/src/package.spec.ts +14 -3
|
@@ -29,7 +29,7 @@ let TypeOrmInitializer = class TypeOrmInitializer {
|
|
|
29
29
|
for (const config of configs) {
|
|
30
30
|
config.entities = EntityProvider.getEntities(config.name) || [];
|
|
31
31
|
}
|
|
32
|
-
await createDataSources(configs);
|
|
32
|
+
await createDataSources(this.dataSourceManager, configs);
|
|
33
33
|
this.initialized.resolve();
|
|
34
34
|
}
|
|
35
35
|
onStop(app) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-initializer.js","sourceRoot":"","sources":["../../src/common/typeorm-initializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAe,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxG,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGrC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAEM,gBAAW,GAAG,IAAI,QAAQ,EAAQ,CAAC;IAmChD,CAAC;IA3BG,KAAK,CAAC,OAAO,CAAC,GAAgB;QAC1B,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,IAAI,OAAc,CAAC;QACnB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,OAAO,GAAG,SAAS,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,SAAS,CAAC,IAAI,GAAG,uBAAuB,CAAC;YACzC,OAAO,GAAG,CAAE,SAAS,CAAE,CAAC;QAC5B,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACpE,CAAC;QAED,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"typeorm-initializer.js","sourceRoot":"","sources":["../../src/common/typeorm-initializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAe,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxG,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGrC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAEM,gBAAW,GAAG,IAAI,QAAQ,EAAQ,CAAC;IAmChD,CAAC;IA3BG,KAAK,CAAC,OAAO,CAAC,GAAgB;QAC1B,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,IAAI,OAAc,CAAC;QACnB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,OAAO,GAAG,SAAS,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,SAAS,CAAC,IAAI,GAAG,uBAAuB,CAAC;YACzC,OAAO,GAAG,CAAE,SAAS,CAAE,CAAC;QAC5B,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACpE,CAAC;QAED,MAAM,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,GAAgB;QACnB,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC;QACvD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACnC,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;gBAC3B,UAAU,CAAC,OAAO,EAAE,CAAC;YACzB,CAAC;QACL,CAAC;IACL,CAAC;CAEJ,CAAA;AAhCsB;IADlB,KAAK,CAAC,SAAS,CAAC;;mDACe;AAGb;IADlB,SAAS,CAAC,iBAAiB,CAAC;8BACS,iBAAiB;6DAAC;AAR/C,kBAAkB;IAD9B,SAAS,CAAC,oBAAoB,CAAC;GACnB,kBAAkB,CAqC9B"}
|
package/esm/common/utils.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { DataSource, DataSourceOptions } from 'typeorm';
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
import { DataSourceManager } from './data-source-manager.js';
|
|
3
|
+
/** The data source `name` of the manager, initialized. */
|
|
4
|
+
export declare function getDataSource(dataSourceManager: DataSourceManager, name?: string): Promise<DataSource>;
|
|
5
|
+
export declare function createDataSources(dataSourceManager: DataSourceManager, options: DataSourceOptions[]): Promise<DataSource[]>;
|
|
4
6
|
/**
|
|
5
7
|
* Database drivers are peer dependencies the project installs (mysql2 for `type: mysql`). When one
|
|
6
8
|
* is missing, typeorm throws a DriverPackageNotInstalledError; this turns it into a CellError that
|
package/esm/common/utils.js
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
export async function getDataSource(name) {
|
|
4
|
-
const dataSourceManager = ContainerUtil.get(DataSourceManager);
|
|
1
|
+
/** The data source `name` of the manager, initialized. */
|
|
2
|
+
export async function getDataSource(dataSourceManager, name) {
|
|
5
3
|
const dataSource = dataSourceManager.get(name);
|
|
6
4
|
if (!dataSource.isInitialized) {
|
|
7
5
|
await dataSource.initialize();
|
|
8
6
|
}
|
|
9
7
|
return dataSource;
|
|
10
8
|
}
|
|
11
|
-
export async function createDataSources(options) {
|
|
9
|
+
export async function createDataSources(dataSourceManager, options) {
|
|
12
10
|
var _a;
|
|
13
|
-
const dataSourceManager = ContainerUtil.get(DataSourceManager);
|
|
14
11
|
try {
|
|
15
12
|
const dataSources = options.map(option => dataSourceManager.create(option));
|
|
16
13
|
// Do not use Promise.all or test 8522 will produce a dangling sqlite connection
|
package/esm/common/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAGA,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,iBAAoC,EAAE,IAAa;IACnF,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAC5B,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;IAClC,CAAC;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,iBAAoC,EAAE,OAA4B;;IACtG,IAAI,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,gFAAgF;QAChF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACnC,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;QAClC,CAAC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,YAAM,CAAC,MAAM,oBAAoB,CAAC,KAAK,CAAC,CAAC,mCAAI,KAAK,CAAC;IACvD,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,KAAc;;IACrD,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,gCAAgC,EAAE,CAAC;QAC/E,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,MAAM,GAAG,MAAA,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,0CAAG,CAAC,CAAC,CAAC;IAClE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;IAClD,OAAO,IAAI,SAAS,CAAC;QACjB,IAAI,EAAE,6BAA6B;QACnC,OAAO,EAAE,sBAAsB,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,sBAAsB,KAAK,CAAC,OAAO,EAAE;QAC9F,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,0DAA0D,MAAM,EAAE,CAAC,CAAC,CAAC,uEAAuE;QAC3J,KAAK,EAAE,KAAK;KACf,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { DEFAULT_CONNECTION_NAME, getDataSource } from '../../common/index.js';
|
|
1
|
+
import { DataSourceManager, DEFAULT_CONNECTION_NAME, getDataSource } from '../../common/index.js';
|
|
2
2
|
import { OrmContext } from '../context/index.js';
|
|
3
|
+
import { InjectionUtil } from '@celljs/core';
|
|
3
4
|
import { Context } from '@celljs/core/lib/node';
|
|
4
5
|
export var Propagation;
|
|
5
6
|
(function (Propagation) {
|
|
@@ -16,6 +17,8 @@ export var TransactionalOption;
|
|
|
16
17
|
export const Transactional = function (nameOrTransactionalOption) {
|
|
17
18
|
const { name, isolation, propagation, readOnly } = getTransactionalOption(nameOrTransactionalOption);
|
|
18
19
|
return (target, methodName, descriptor) => {
|
|
20
|
+
// The data sources are those of the container that created the component.
|
|
21
|
+
InjectionUtil.keepContainer(target);
|
|
19
22
|
const originalMethod = descriptor.value;
|
|
20
23
|
descriptor.value = async function (...args) {
|
|
21
24
|
if (propagation === Propagation.Required) {
|
|
@@ -33,7 +36,7 @@ export const Transactional = function (nameOrTransactionalOption) {
|
|
|
33
36
|
OrmContext.popEntityManager(name);
|
|
34
37
|
}
|
|
35
38
|
};
|
|
36
|
-
const dataSource = await getDataSource(name);
|
|
39
|
+
const dataSource = await getDataSource(InjectionUtil.containerOf(this, String(methodName)).get(DataSourceManager), name);
|
|
37
40
|
const manager = dataSource.manager;
|
|
38
41
|
if (readOnly) {
|
|
39
42
|
return callback(manager);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/node/annotation/transactional.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/node/annotation/transactional.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ let TypeOrmInitializer = class TypeOrmInitializer {
|
|
|
32
32
|
for (const config of configs) {
|
|
33
33
|
config.entities = entity_provider_1.EntityProvider.getEntities(config.name) || [];
|
|
34
34
|
}
|
|
35
|
-
await (0, utils_1.createDataSources)(configs);
|
|
35
|
+
await (0, utils_1.createDataSources)(this.dataSourceManager, configs);
|
|
36
36
|
this.initialized.resolve();
|
|
37
37
|
}
|
|
38
38
|
onStop(app) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-initializer.js","sourceRoot":"","sources":["../../src/common/typeorm-initializer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAwG;AACxG,2CAAsD;AACtD,+DAA0D;AAC1D,uDAAmD;AACnD,mCAA4C;AAGrC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAEM,gBAAW,GAAG,IAAI,eAAQ,EAAQ,CAAC;IAmChD,CAAC;IA3BG,KAAK,CAAC,OAAO,CAAC,GAAgB;QAC1B,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,IAAI,OAAc,CAAC;QACnB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,OAAO,GAAG,SAAS,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,SAAS,CAAC,IAAI,GAAG,mCAAuB,CAAC;YACzC,OAAO,GAAG,CAAE,SAAS,CAAE,CAAC;QAC5B,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,CAAC,QAAQ,GAAG,gCAAc,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACpE,CAAC;QAED,MAAM,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"typeorm-initializer.js","sourceRoot":"","sources":["../../src/common/typeorm-initializer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAwG;AACxG,2CAAsD;AACtD,+DAA0D;AAC1D,uDAAmD;AACnD,mCAA4C;AAGrC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAEM,gBAAW,GAAG,IAAI,eAAQ,EAAQ,CAAC;IAmChD,CAAC;IA3BG,KAAK,CAAC,OAAO,CAAC,GAAgB;QAC1B,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,IAAI,OAAc,CAAC;QACnB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,OAAO,GAAG,SAAS,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,SAAS,CAAC,IAAI,GAAG,mCAAuB,CAAC;YACzC,OAAO,GAAG,CAAE,SAAS,CAAE,CAAC;QAC5B,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,CAAC,QAAQ,GAAG,gCAAc,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACpE,CAAC;QAED,MAAM,IAAA,yBAAiB,EAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,GAAgB;QACnB,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC;QACvD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACnC,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;gBAC3B,UAAU,CAAC,OAAO,EAAE,CAAC;YACzB,CAAC;QACL,CAAC;IACL,CAAC;CAEJ,CAAA;;AAhCsB;IADlB,IAAA,YAAK,EAAC,SAAS,CAAC;;mDACe;AAGb;IADlB,IAAA,gBAAS,EAAC,uCAAiB,CAAC;8BACS,uCAAiB;6DAAC;6BAR/C,kBAAkB;IAD9B,IAAA,gBAAS,EAAC,2BAAoB,CAAC;GACnB,kBAAkB,CAqC9B"}
|
package/lib/common/utils.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { DataSource, DataSourceOptions } from 'typeorm';
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
import { DataSourceManager } from './data-source-manager';
|
|
3
|
+
/** The data source `name` of the manager, initialized. */
|
|
4
|
+
export declare function getDataSource(dataSourceManager: DataSourceManager, name?: string): Promise<DataSource>;
|
|
5
|
+
export declare function createDataSources(dataSourceManager: DataSourceManager, options: DataSourceOptions[]): Promise<DataSource[]>;
|
|
4
6
|
/**
|
|
5
7
|
* Database drivers are peer dependencies the project installs (mysql2 for `type: mysql`). When one
|
|
6
8
|
* is missing, typeorm throws a DriverPackageNotInstalledError; this turns it into a CellError that
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,0DAA0D;AAC1D,wBAAsB,aAAa,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,IAAI,CAAC,EAAE,MAAM,uBAMtF;AAED,wBAAsB,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAWjI;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAYrF"}
|
package/lib/common/utils.js
CHANGED
|
@@ -3,19 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getDataSource = getDataSource;
|
|
4
4
|
exports.createDataSources = createDataSources;
|
|
5
5
|
exports.toDriverMissingError = toDriverMissingError;
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
async function getDataSource(name) {
|
|
9
|
-
const dataSourceManager = core_1.ContainerUtil.get(common_1.DataSourceManager);
|
|
6
|
+
/** The data source `name` of the manager, initialized. */
|
|
7
|
+
async function getDataSource(dataSourceManager, name) {
|
|
10
8
|
const dataSource = dataSourceManager.get(name);
|
|
11
9
|
if (!dataSource.isInitialized) {
|
|
12
10
|
await dataSource.initialize();
|
|
13
11
|
}
|
|
14
12
|
return dataSource;
|
|
15
13
|
}
|
|
16
|
-
async function createDataSources(options) {
|
|
14
|
+
async function createDataSources(dataSourceManager, options) {
|
|
17
15
|
var _a;
|
|
18
|
-
const dataSourceManager = core_1.ContainerUtil.get(common_1.DataSourceManager);
|
|
19
16
|
try {
|
|
20
17
|
const dataSources = options.map(option => dataSourceManager.create(option));
|
|
21
18
|
// Do not use Promise.all or test 8522 will produce a dangling sqlite connection
|
package/lib/common/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;;;AAGA,0DAA0D;AACnD,KAAK,wBAAwB,iBAAoC,EAAE,IAAa;IACnF,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAC5B,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;IAClC,CAAC;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAEM,KAAK,4BAA4B,iBAAoC,EAAE,OAA4B;;IACtG,IAAI,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,gFAAgF;QAChF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACnC,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;QAClC,CAAC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,YAAM,CAAC,MAAM,oBAAoB,CAAC,KAAK,CAAC,CAAC,mCAAI,KAAK,CAAC;IACvD,CAAC;AACL,CAAC;AAED;;;;GAIG;AACI,KAAK,+BAA+B,KAAc;;IACrD,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,gCAAgC,EAAE,CAAC;QAC/E,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,MAAM,GAAG,MAAA,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,0CAAG,CAAC,CAAC,CAAC;IAClE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;IAClD,OAAO,IAAI,SAAS,CAAC;QACjB,IAAI,EAAE,6BAA6B;QACnC,OAAO,EAAE,sBAAsB,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,sBAAsB,KAAK,CAAC,OAAO,EAAE;QAC9F,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,0DAA0D,MAAM,EAAE,CAAC,CAAC,CAAC,uEAAuE;QAC3J,KAAK,EAAE,KAAK;KACf,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactional.d.ts","sourceRoot":"","sources":["../../../src/node/annotation/transactional.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"transactional.d.ts","sourceRoot":"","sources":["../../../src/node/annotation/transactional.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAO7E,oBAAY,WAAW;IACnB,QAAQ,IAAA;IAAE,WAAW,IAAA;CACxB;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AACD,yBAAiB,mBAAmB,CAAC;IACjC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,mBAAmB,CAE7D;CACJ;AAED,MAAM,WAAW,sBAAsB;IACnC,CAAC,yBAAyB,CAAC,EAAE,MAAM,GAAG,mBAAmB,GAAG,eAAe,CAAC;CAC/E;AAED,eAAO,MAAM,aAAa,EAAI,sBAuD7B,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,yBAAyB,CAAC,EAAE,MAAM,GAAG,mBAAmB,uBAc9F"}
|
|
@@ -4,6 +4,7 @@ exports.Transactional = exports.TransactionalOption = exports.Propagation = void
|
|
|
4
4
|
exports.getTransactionalOption = getTransactionalOption;
|
|
5
5
|
const common_1 = require("../../common");
|
|
6
6
|
const context_1 = require("../context");
|
|
7
|
+
const core_1 = require("@celljs/core");
|
|
7
8
|
const node_1 = require("@celljs/core/lib/node");
|
|
8
9
|
var Propagation;
|
|
9
10
|
(function (Propagation) {
|
|
@@ -20,6 +21,8 @@ var TransactionalOption;
|
|
|
20
21
|
exports.Transactional = function (nameOrTransactionalOption) {
|
|
21
22
|
const { name, isolation, propagation, readOnly } = getTransactionalOption(nameOrTransactionalOption);
|
|
22
23
|
return (target, methodName, descriptor) => {
|
|
24
|
+
// The data sources are those of the container that created the component.
|
|
25
|
+
core_1.InjectionUtil.keepContainer(target);
|
|
23
26
|
const originalMethod = descriptor.value;
|
|
24
27
|
descriptor.value = async function (...args) {
|
|
25
28
|
if (propagation === Propagation.Required) {
|
|
@@ -37,7 +40,7 @@ exports.Transactional = function (nameOrTransactionalOption) {
|
|
|
37
40
|
context_1.OrmContext.popEntityManager(name);
|
|
38
41
|
}
|
|
39
42
|
};
|
|
40
|
-
const dataSource = await (0, common_1.getDataSource)(name);
|
|
43
|
+
const dataSource = await (0, common_1.getDataSource)(core_1.InjectionUtil.containerOf(this, String(methodName)).get(common_1.DataSourceManager), name);
|
|
41
44
|
const manager = dataSource.manager;
|
|
42
45
|
if (readOnly) {
|
|
43
46
|
return callback(manager);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/node/annotation/transactional.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/node/annotation/transactional.ts"],"names":[],"mappings":"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"}
|
package/lib/package.spec.js
CHANGED
|
@@ -1,7 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
const bun_test_1 = require("bun:test");
|
|
4
|
-
|
|
5
|
-
|
|
7
|
+
const core_1 = require("@celljs/core");
|
|
8
|
+
const assembly_test_util_1 = require("@celljs/core/lib/common/test/assembly-test-util");
|
|
9
|
+
const static_module_1 = __importDefault(require("@celljs/core/lib/common/static-module"));
|
|
10
|
+
const static_module_2 = __importDefault(require("@celljs/core/lib/node/static-module"));
|
|
11
|
+
const module_1 = __importDefault(require("./node/module"));
|
|
12
|
+
core_1.currentThis.cellProps = {};
|
|
13
|
+
(0, bun_test_1.describe)('@celljs/typeorm', () => {
|
|
14
|
+
(0, bun_test_1.it)('its DI module loads after those of its dependencies and every binding resolves', () => {
|
|
15
|
+
const { changed, errors } = assembly_test_util_1.AssemblyTestUtil.check([static_module_1.default, static_module_2.default], module_1.default);
|
|
16
|
+
(0, bun_test_1.expect)(errors).toEqual([]);
|
|
17
|
+
(0, bun_test_1.expect)(changed).toBeGreaterThan(0);
|
|
18
|
+
});
|
|
6
19
|
});
|
|
7
20
|
//# sourceMappingURL=package.spec.js.map
|
package/lib/package.spec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.spec.js","sourceRoot":"","sources":["../src/package.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package.spec.js","sourceRoot":"","sources":["../src/package.spec.ts"],"names":[],"mappings":";;;;;AAAA,uCAAgD;AAChD,uCAA2C;AAC3C,wFAAmF;AACnF,0FAAuD;AACvD,wFAAqD;AACrD,2DAAiC;AAEjC,kBAAW,CAAC,SAAS,GAAG,EAAE,CAAC;AAE3B,IAAA,mBAAQ,EAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,IAAA,aAAE,EAAC,gFAAgF,EAAE,GAAG,EAAE;QACtF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,qCAAgB,CAAC,KAAK,CAAC,CAAC,uBAAE,EAAE,uBAAE,CAAC,EAAE,gBAAI,CAAC,CAAC;QACnE,IAAA,iBAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAA,iBAAM,EAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/typeorm",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.6.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cell-component"
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
"watch": "tsc -b -w --preserveWatchOutput"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@celljs/core": "4.
|
|
37
|
-
"@celljs/kit": "4.
|
|
36
|
+
"@celljs/core": "4.6.0",
|
|
37
|
+
"@celljs/kit": "4.6.0",
|
|
38
38
|
"typeorm": "^0.3.31"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
@@ -29,7 +29,7 @@ export class TypeOrmInitializer implements ApplicationLifecycle<Application> {
|
|
|
29
29
|
config.entities = EntityProvider.getEntities(config.name) || [];
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
await createDataSources(configs);
|
|
32
|
+
await createDataSources(this.dataSourceManager, configs);
|
|
33
33
|
this.initialized.resolve();
|
|
34
34
|
}
|
|
35
35
|
|
package/src/common/utils.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { ContainerUtil } from '@celljs/core';
|
|
2
1
|
import { DataSource, DataSourceOptions } from 'typeorm';
|
|
3
|
-
import { DataSourceManager } from '
|
|
2
|
+
import { DataSourceManager } from './data-source-manager';
|
|
4
3
|
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
/** The data source `name` of the manager, initialized. */
|
|
5
|
+
export async function getDataSource(dataSourceManager: DataSourceManager, name?: string) {
|
|
7
6
|
const dataSource = dataSourceManager.get(name);
|
|
8
7
|
if (!dataSource.isInitialized) {
|
|
9
8
|
await dataSource.initialize();
|
|
@@ -11,8 +10,7 @@ export async function getDataSource(name?: string) {
|
|
|
11
10
|
return dataSource;
|
|
12
11
|
}
|
|
13
12
|
|
|
14
|
-
export async function createDataSources(options: DataSourceOptions[]): Promise<DataSource[]> {
|
|
15
|
-
const dataSourceManager = ContainerUtil.get(DataSourceManager);
|
|
13
|
+
export async function createDataSources(dataSourceManager: DataSourceManager, options: DataSourceOptions[]): Promise<DataSource[]> {
|
|
16
14
|
try {
|
|
17
15
|
const dataSources = options.map(option => dataSourceManager.create(option));
|
|
18
16
|
// Do not use Promise.all or test 8522 will produce a dangling sqlite connection
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { IsolationLevel } from 'typeorm/driver/types/IsolationLevel.js';
|
|
2
|
-
import { DEFAULT_CONNECTION_NAME, getDataSource } from '../../common';
|
|
2
|
+
import { DataSourceManager, DEFAULT_CONNECTION_NAME, getDataSource } from '../../common';
|
|
3
3
|
import { EntityManager } from 'typeorm';
|
|
4
4
|
import { OrmContext } from '../context';
|
|
5
|
+
import { InjectionUtil } from '@celljs/core';
|
|
5
6
|
import { Context } from '@celljs/core/lib/node';
|
|
6
7
|
|
|
7
8
|
export enum Propagation {
|
|
@@ -27,6 +28,8 @@ export interface TransactionalDecorator {
|
|
|
27
28
|
export const Transactional = <TransactionalDecorator>function (nameOrTransactionalOption?: string | TransactionalOption): MethodDecorator {
|
|
28
29
|
const { name, isolation, propagation, readOnly } = getTransactionalOption(nameOrTransactionalOption);
|
|
29
30
|
return (target: Object, methodName: string, descriptor: PropertyDescriptor) => {
|
|
31
|
+
// The data sources are those of the container that created the component.
|
|
32
|
+
InjectionUtil.keepContainer(target);
|
|
30
33
|
const originalMethod = descriptor.value;
|
|
31
34
|
descriptor.value = async function (...args: any[]) {
|
|
32
35
|
if (propagation === Propagation.Required) {
|
|
@@ -44,7 +47,7 @@ export const Transactional = <TransactionalDecorator>function (nameOrTransaction
|
|
|
44
47
|
OrmContext.popEntityManager(name!);
|
|
45
48
|
}
|
|
46
49
|
};
|
|
47
|
-
const dataSource = await getDataSource(name);
|
|
50
|
+
const dataSource = await getDataSource(InjectionUtil.containerOf(this, String(methodName)).get(DataSourceManager), name);
|
|
48
51
|
const manager = dataSource.manager;
|
|
49
52
|
if (readOnly) {
|
|
50
53
|
return callback(manager);
|
package/src/package.spec.ts
CHANGED
|
@@ -1,5 +1,16 @@
|
|
|
1
|
-
import { describe, it } from 'bun:test';
|
|
2
|
-
|
|
1
|
+
import { describe, expect, it } from 'bun:test';
|
|
2
|
+
import { currentThis } from '@celljs/core';
|
|
3
|
+
import { AssemblyTestUtil } from '@celljs/core/lib/common/test/assembly-test-util';
|
|
4
|
+
import m0 from '@celljs/core/lib/common/static-module';
|
|
5
|
+
import m1 from '@celljs/core/lib/node/static-module';
|
|
6
|
+
import own0 from './node/module';
|
|
3
7
|
|
|
4
|
-
|
|
8
|
+
currentThis.cellProps = {};
|
|
9
|
+
|
|
10
|
+
describe('@celljs/typeorm', () => {
|
|
11
|
+
it('its DI module loads after those of its dependencies and every binding resolves', () => {
|
|
12
|
+
const { changed, errors } = AssemblyTestUtil.check([m0, m1], own0);
|
|
13
|
+
expect(errors).toEqual([]);
|
|
14
|
+
expect(changed).toBeGreaterThan(0);
|
|
15
|
+
});
|
|
5
16
|
});
|