@wisemen/nestjs-typeorm 1.1.0 → 1.1.1
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/extensions/repository.js.map +1 -1
- package/dist/operators/and-or-ignore.d.ts +12 -0
- package/dist/operators/and-or-ignore.js +24 -0
- package/dist/operators/and-or-ignore.js.map +1 -0
- package/dist/operators/index.d.ts +1 -0
- package/dist/operators/index.js +1 -0
- package/dist/operators/index.js.map +1 -1
- package/dist/operators/tests/and-or-ignore.integration.test.d.ts +1 -0
- package/dist/operators/tests/and-or-ignore.integration.test.js +104 -0
- package/dist/operators/tests/and-or-ignore.integration.test.js.map +1 -0
- package/dist/operators/tests/sql/datasource.d.ts +2 -0
- package/dist/operators/tests/sql/datasource.js +19 -0
- package/dist/operators/tests/sql/datasource.js.map +1 -0
- package/dist/operators/tests/sql/test.entity.d.ts +7 -0
- package/dist/operators/tests/sql/test.entity.js +42 -0
- package/dist/operators/tests/sql/test.entity.js.map +1 -0
- package/dist/operators/tests/test-setup.d.ts +6 -0
- package/dist/operators/tests/test-setup.js +44 -0
- package/dist/operators/tests/test-setup.js.map +1 -0
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAsD,KAAK,EAAkB,YAAY,EAAyD,QAAQ,EAAE,QAAQ,EAAqD,UAAU,EAAE,MAAM,SAAS,CAAA;AAChQ,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAA;AAE1D,MAAM,OAAO,iBAA2C,SAAQ,UAAc;IAC5E,YAAa,MAAuB,EAAE,OAAsB;QAC1D,MAAM,KAAK,GAAG,6BAA6B,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAA;QAEhF,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC;IAID,KAAK,CAAC,eAAe,CAAE,UAA0D;QAC/E,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,MAAuB,CAAA;YAEhD,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CACrC,IAAI,YAAY,WAAW,CAAC,CAAC,CAAC,IAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAsB,CAAC,CAC9E,CAAA;YAED,MAAM,IAAI,CAAC,MAAM,CAAC,QAAuC,CAAC,CAAA;YAE1D,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,MAAuB,CAAA;QAChD,MAAM,QAAQ,GAAG,UAAU,YAAY,WAAW,CAAA;QAElD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,MAAM,CAAC,UAAuC,CAAC,CAAA;YAE1D,OAAO,UAAe,CAAA;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { FindOperator } from 'typeorm';
|
|
2
|
+
/**
|
|
3
|
+
* Perform a Typeorm `And` operator on a filtered set of given operators.
|
|
4
|
+
* `undefined` operators are ignored.
|
|
5
|
+
*
|
|
6
|
+
* When no operators would remain, `undefined` is returned.
|
|
7
|
+
* When 1 operator would remain, that operator is returned.
|
|
8
|
+
* When >1 operator would remain, a Typeorm `And` operator is used on the remaining operators.
|
|
9
|
+
*
|
|
10
|
+
* Typically used when other helper functions and operators can return `undefined`
|
|
11
|
+
*/
|
|
12
|
+
export declare function AndOrIgnore<E, W extends FindOperator<E>>(...operators: (W | undefined)[]): FindOperator<E> | undefined;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { And } from 'typeorm';
|
|
2
|
+
/**
|
|
3
|
+
* Perform a Typeorm `And` operator on a filtered set of given operators.
|
|
4
|
+
* `undefined` operators are ignored.
|
|
5
|
+
*
|
|
6
|
+
* When no operators would remain, `undefined` is returned.
|
|
7
|
+
* When 1 operator would remain, that operator is returned.
|
|
8
|
+
* When >1 operator would remain, a Typeorm `And` operator is used on the remaining operators.
|
|
9
|
+
*
|
|
10
|
+
* Typically used when other helper functions and operators can return `undefined`
|
|
11
|
+
*/
|
|
12
|
+
export function AndOrIgnore(...operators) {
|
|
13
|
+
const filteredOperators = operators.filter(o => o !== undefined);
|
|
14
|
+
if (filteredOperators.length === 0) {
|
|
15
|
+
return undefined;
|
|
16
|
+
}
|
|
17
|
+
else if (filteredOperators.length === 1) {
|
|
18
|
+
return filteredOperators[0];
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
return And(...filteredOperators);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=and-or-ignore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"and-or-ignore.js","sourceRoot":"","sources":["../../lib/operators/and-or-ignore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAgB,MAAM,SAAS,CAAA;AAE3C;;;;;;;;;GASG;AACH,MAAM,UAAU,WAAW,CACzB,GAAG,SAA4B;IAE/B,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAA;IAEhE,IAAG,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,SAAS,CAAA;IAClB,CAAC;SAAM,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1C,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAA;IAC7B,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,CAAC,GAAG,iBAAiB,CAAC,CAAA;IAClC,CAAC;AACH,CAAC"}
|
package/dist/operators/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/operators/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/operators/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { after, before, describe, it } from 'node:test';
|
|
2
|
+
import { expect } from 'expect';
|
|
3
|
+
import { Equal, In, LessThan, MoreThan } from 'typeorm';
|
|
4
|
+
import { IntegrationTestSetup } from './test-setup.js';
|
|
5
|
+
import { AndOrIgnore } from '../and-or-ignore.js';
|
|
6
|
+
import { dataSource } from './sql/datasource.js';
|
|
7
|
+
import { TestEntity } from './sql/test.entity.js';
|
|
8
|
+
describe('AnyOrIgnore', () => {
|
|
9
|
+
const integrationTest = new IntegrationTestSetup();
|
|
10
|
+
before(async () => {
|
|
11
|
+
await integrationTest.setup();
|
|
12
|
+
});
|
|
13
|
+
after(async () => {
|
|
14
|
+
await integrationTest.teardown();
|
|
15
|
+
});
|
|
16
|
+
it('returns undefined when all operators are undefined', async () => {
|
|
17
|
+
await seed(dataSource, { id: 1, name: 'Alice', age: 25, email: 'alice@example.com', city: 'New York' });
|
|
18
|
+
await seed(dataSource, { id: 2, name: 'Bob', age: 30, email: 'bob@example.com', city: 'London' });
|
|
19
|
+
const results = await dataSource.manager.find(TestEntity, {
|
|
20
|
+
where: {
|
|
21
|
+
id: In([1, 2]),
|
|
22
|
+
age: AndOrIgnore(undefined, undefined, undefined)
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
// When operator is undefined, it should be ignored and return all records
|
|
26
|
+
expect(results.length).toBe(2);
|
|
27
|
+
});
|
|
28
|
+
it('returns the single operator when only one non-undefined operator is provided', async () => {
|
|
29
|
+
await seed(dataSource, { id: 3, name: 'Charlie', age: 25, email: 'charlie@example.com', city: 'Paris' });
|
|
30
|
+
await seed(dataSource, { id: 4, name: 'Diana', age: 30, email: 'diana@example.com', city: 'Berlin' });
|
|
31
|
+
await seed(dataSource, { id: 5, name: 'Eve', age: 35, email: 'eve@example.com', city: 'Madrid' });
|
|
32
|
+
const results = await dataSource.manager.find(TestEntity, {
|
|
33
|
+
where: {
|
|
34
|
+
id: In([3, 4, 5]),
|
|
35
|
+
age: AndOrIgnore(MoreThan(27), undefined, undefined)
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
expect(results.length).toBe(2);
|
|
39
|
+
expect(results.some(r => r.id === 4)).toBe(true);
|
|
40
|
+
expect(results.some(r => r.id === 5)).toBe(true);
|
|
41
|
+
});
|
|
42
|
+
it('returns And() when multiple non-undefined operators are provided', async () => {
|
|
43
|
+
await seed(dataSource, { id: 6, name: 'Frank', age: 20, email: 'frank@example.com', city: 'Rome' });
|
|
44
|
+
await seed(dataSource, { id: 7, name: 'Grace', age: 25, email: 'grace@example.com', city: 'Vienna' });
|
|
45
|
+
await seed(dataSource, { id: 8, name: 'Henry', age: 30, email: 'henry@example.com', city: 'Prague' });
|
|
46
|
+
await seed(dataSource, { id: 9, name: 'Ivy', age: 35, email: 'ivy@example.com', city: 'Budapest' });
|
|
47
|
+
const results = await dataSource.manager.find(TestEntity, {
|
|
48
|
+
where: {
|
|
49
|
+
id: In([6, 7, 8, 9]),
|
|
50
|
+
age: AndOrIgnore(MoreThan(22), LessThan(32))
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
// Should return ages between 22 and 32 (25 and 30)
|
|
54
|
+
expect(results.length).toBe(2);
|
|
55
|
+
expect(results.some(r => r.id === 7)).toBe(true);
|
|
56
|
+
expect(results.some(r => r.id === 8)).toBe(true);
|
|
57
|
+
});
|
|
58
|
+
it('filters out undefined operators and combines the rest with And()', async () => {
|
|
59
|
+
await seed(dataSource, { id: 10, name: 'Jack', age: 20, email: 'jack@example.com', city: 'Athens' });
|
|
60
|
+
await seed(dataSource, { id: 11, name: 'Kate', age: 25, email: 'kate@example.com', city: 'Dublin' });
|
|
61
|
+
await seed(dataSource, { id: 12, name: 'Liam', age: 30, email: 'liam@example.com', city: 'Oslo' });
|
|
62
|
+
await seed(dataSource, { id: 13, name: 'Mia', age: 35, email: 'mia@example.com', city: 'Stockholm' });
|
|
63
|
+
const results = await dataSource.manager.find(TestEntity, {
|
|
64
|
+
where: {
|
|
65
|
+
id: In([10, 11, 12, 13]),
|
|
66
|
+
age: AndOrIgnore(undefined, MoreThan(22), undefined, LessThan(32), undefined)
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
// Should return ages between 22 and 32 (25 and 30)
|
|
70
|
+
expect(results.length).toBe(2);
|
|
71
|
+
expect(results.some(r => r.id === 11)).toBe(true);
|
|
72
|
+
expect(results.some(r => r.id === 12)).toBe(true);
|
|
73
|
+
});
|
|
74
|
+
it('works with Equal operator', async () => {
|
|
75
|
+
await seed(dataSource, { id: 14, name: 'Noah', age: 28, email: 'noah@example.com', city: 'Helsinki' });
|
|
76
|
+
await seed(dataSource, { id: 15, name: 'Olivia', age: 28, email: 'olivia@example.com', city: 'Copenhagen' });
|
|
77
|
+
await seed(dataSource, { id: 16, name: 'Paul', age: 29, email: 'paul@example.com', city: 'Brussels' });
|
|
78
|
+
const results = await dataSource.manager.find(TestEntity, {
|
|
79
|
+
where: {
|
|
80
|
+
id: In([14, 15, 16]),
|
|
81
|
+
age: AndOrIgnore(Equal(28))
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
expect(results.length).toBe(2);
|
|
85
|
+
expect(results.some(r => r.id === 14)).toBe(true);
|
|
86
|
+
expect(results.some(r => r.id === 15)).toBe(true);
|
|
87
|
+
});
|
|
88
|
+
it('returns first operator when only first is defined', async () => {
|
|
89
|
+
await seed(dataSource, { id: 17, name: 'Quinn', age: 40, email: 'quinn@example.com', city: 'Amsterdam' });
|
|
90
|
+
await seed(dataSource, { id: 18, name: 'Rachel', age: 45, email: 'rachel@example.com', city: 'Lisbon' });
|
|
91
|
+
const results = await dataSource.manager.find(TestEntity, {
|
|
92
|
+
where: {
|
|
93
|
+
id: In([17, 18]),
|
|
94
|
+
age: AndOrIgnore(MoreThan(42), undefined)
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
expect(results.length).toBe(1);
|
|
98
|
+
expect(results[0].id).toBe(18);
|
|
99
|
+
});
|
|
100
|
+
async function seed(dataSource, row) {
|
|
101
|
+
await dataSource.manager.upsert(TestEntity, row, { conflictPaths: { id: true } });
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
//# sourceMappingURL=and-or-ignore.integration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"and-or-ignore.integration.test.js","sourceRoot":"","sources":["../../../lib/operators/tests/and-or-ignore.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { DataSource } from 'typeorm';
|
|
2
|
+
import { SnakeNamingStrategy } from '#src/naming/snake-case.naming-strategy.js';
|
|
3
|
+
import { sslHelper } from '#src/helpers/ssl.js';
|
|
4
|
+
export const dataSource = new DataSource({
|
|
5
|
+
type: 'postgres',
|
|
6
|
+
url: process.env.DATABASE_URI,
|
|
7
|
+
ssl: sslHelper(process.env.DATABASE_SSL),
|
|
8
|
+
extra: { max: 50 },
|
|
9
|
+
logging: false,
|
|
10
|
+
synchronize: false,
|
|
11
|
+
migrationsRun: true,
|
|
12
|
+
entities: ['dist/**/test.entity.js'],
|
|
13
|
+
namingStrategy: new SnakeNamingStrategy(),
|
|
14
|
+
invalidWhereValuesBehavior: {
|
|
15
|
+
null: 'throw',
|
|
16
|
+
undefined: 'ignore',
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
//# sourceMappingURL=datasource.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../../../lib/operators/tests/sql/datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAA;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC;IACvC,IAAI,EAAE,UAAU;IAChB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;IAC7B,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;IACxC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;IAClB,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,IAAI;IACnB,QAAQ,EAAE,CAAC,wBAAwB,CAAC;IACpC,cAAc,EAAE,IAAI,mBAAmB,EAAE;IACzC,0BAA0B,EAAE;QAC1B,IAAI,EAAE,OAAO;QACb,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC,CAAA"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
|
|
11
|
+
let TestEntity = class TestEntity {
|
|
12
|
+
id;
|
|
13
|
+
name;
|
|
14
|
+
age;
|
|
15
|
+
email;
|
|
16
|
+
city;
|
|
17
|
+
};
|
|
18
|
+
__decorate([
|
|
19
|
+
PrimaryGeneratedColumn(),
|
|
20
|
+
__metadata("design:type", Number)
|
|
21
|
+
], TestEntity.prototype, "id", void 0);
|
|
22
|
+
__decorate([
|
|
23
|
+
Column({ type: 'varchar' }),
|
|
24
|
+
__metadata("design:type", String)
|
|
25
|
+
], TestEntity.prototype, "name", void 0);
|
|
26
|
+
__decorate([
|
|
27
|
+
Column({ type: 'int' }),
|
|
28
|
+
__metadata("design:type", Number)
|
|
29
|
+
], TestEntity.prototype, "age", void 0);
|
|
30
|
+
__decorate([
|
|
31
|
+
Column({ type: 'varchar', nullable: true }),
|
|
32
|
+
__metadata("design:type", String)
|
|
33
|
+
], TestEntity.prototype, "email", void 0);
|
|
34
|
+
__decorate([
|
|
35
|
+
Column({ type: 'varchar', nullable: true }),
|
|
36
|
+
__metadata("design:type", String)
|
|
37
|
+
], TestEntity.prototype, "city", void 0);
|
|
38
|
+
TestEntity = __decorate([
|
|
39
|
+
Entity()
|
|
40
|
+
], TestEntity);
|
|
41
|
+
export { TestEntity };
|
|
42
|
+
//# sourceMappingURL=test.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test.entity.js","sourceRoot":"","sources":["../../../../lib/operators/tests/sql/test.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAA;AAGzD,IAAM,UAAU,GAAhB,MAAM,UAAU;IAErB,EAAE,CAAQ;IAGV,IAAI,CAAQ;IAGZ,GAAG,CAAQ;IAGX,KAAK,CAAS;IAGd,IAAI,CAAS;CACd,CAAA;AAbC;IADC,sBAAsB,EAAE;;sCACf;AAGV;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;wCAChB;AAGZ;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;uCACb;AAGX;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC9B;AAGd;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC/B;AAdF,UAAU;IADtB,MAAM,EAAE;GACI,UAAU,CAetB"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { dataSource } from './sql/datasource.js';
|
|
2
|
+
export class IntegrationTestSetup {
|
|
3
|
+
queryRunner;
|
|
4
|
+
originalManager;
|
|
5
|
+
async setup() {
|
|
6
|
+
if (!dataSource.isInitialized) {
|
|
7
|
+
await dataSource.initialize();
|
|
8
|
+
}
|
|
9
|
+
await dataSource.query('SELECT pg_advisory_lock(12345)');
|
|
10
|
+
try {
|
|
11
|
+
await dataSource.synchronize(true);
|
|
12
|
+
}
|
|
13
|
+
finally {
|
|
14
|
+
await dataSource.query('SELECT pg_advisory_unlock(12345)');
|
|
15
|
+
}
|
|
16
|
+
this.queryRunner = dataSource.createQueryRunner();
|
|
17
|
+
await this.queryRunner.connect();
|
|
18
|
+
await this.queryRunner.startTransaction();
|
|
19
|
+
this.originalManager = dataSource.manager;
|
|
20
|
+
Object.defineProperty(dataSource, 'manager', {
|
|
21
|
+
configurable: true,
|
|
22
|
+
value: this.queryRunner.manager
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
async teardown() {
|
|
26
|
+
if (this.queryRunner?.isTransactionActive === true) {
|
|
27
|
+
await this.queryRunner.rollbackTransaction();
|
|
28
|
+
}
|
|
29
|
+
// Restore original manager
|
|
30
|
+
if (this.originalManager) {
|
|
31
|
+
Object.defineProperty(dataSource, 'manager', {
|
|
32
|
+
configurable: true,
|
|
33
|
+
value: this.originalManager
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
if (this.queryRunner) {
|
|
37
|
+
await this.queryRunner.release();
|
|
38
|
+
}
|
|
39
|
+
if (dataSource.isInitialized) {
|
|
40
|
+
await dataSource.destroy();
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=test-setup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-setup.js","sourceRoot":"","sources":["../../../lib/operators/tests/test-setup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAEhD,MAAM,OAAO,oBAAoB;IACvB,WAAW,CAAyB;IACpC,eAAe,CAA2B;IAElD,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;YAC9B,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;QAC/B,CAAC;QAED,MAAM,UAAU,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAExD,IAAI,CAAC;YACH,MAAM,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACpC,CAAC;gBAAS,CAAC;YACT,MAAM,UAAU,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAC5D,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAA;QACjD,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAA;QAChC,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAA;QACzC,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,OAAO,CAAA;QAEzC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE;YAC3C,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO;SAChC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,IAAI,CAAC,WAAW,EAAE,mBAAmB,KAAK,IAAI,EAAE,CAAC;YACnD,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAA;QAC9C,CAAC;QAED,2BAA2B;QAC3B,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE;gBAC3C,YAAY,EAAE,IAAI;gBAClB,KAAK,EAAE,IAAI,CAAC,eAAe;aAC5B,CAAC,CAAA;QACJ,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAA;QAClC,CAAC;QAED,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;YAC7B,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;QAC5B,CAAC;IACH,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wisemen/nestjs-typeorm",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -44,8 +44,8 @@
|
|
|
44
44
|
"lint": "pnpm run lint:oxlint && pnpm run lint:eslint",
|
|
45
45
|
"clean": "rm -rf ./dist",
|
|
46
46
|
"build": "tsc",
|
|
47
|
-
"pretest": "pnpm run build",
|
|
48
|
-
"test": "node --env-file=.env --enable-source-maps --experimental-test-isolation=none --test ./**/*.test.js",
|
|
47
|
+
"pretest": "pnpm clean && pnpm run build",
|
|
48
|
+
"test": "node --env-file=.env.test --enable-source-maps --experimental-test-isolation=none --test ./**/*.test.js",
|
|
49
49
|
"prerelease": "npm run build",
|
|
50
50
|
"release": "pnpx release-it"
|
|
51
51
|
}
|