@uql/core 3.1.1 → 3.1.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/CHANGELOG.md +134 -187
- package/package.json +31 -26
- package/dist/CHANGELOG.md +0 -186
- package/dist/package.json +0 -131
- package/src/@types/index.d.ts +0 -1
- package/src/@types/jest.d.ts +0 -6
- package/src/browser/http/bus.spec.ts +0 -22
- package/src/browser/http/bus.ts +0 -17
- package/src/browser/http/http.spec.ts +0 -70
- package/src/browser/http/http.ts +0 -55
- package/src/browser/http/index.ts +0 -2
- package/src/browser/index.ts +0 -4
- package/src/browser/options.spec.ts +0 -37
- package/src/browser/options.ts +0 -18
- package/src/browser/querier/genericClientRepository.spec.ts +0 -105
- package/src/browser/querier/genericClientRepository.ts +0 -49
- package/src/browser/querier/httpQuerier.ts +0 -82
- package/src/browser/querier/index.ts +0 -3
- package/src/browser/querier/querier.util.spec.ts +0 -35
- package/src/browser/querier/querier.util.ts +0 -18
- package/src/browser/type/clientQuerier.ts +0 -45
- package/src/browser/type/clientQuerierPool.ts +0 -5
- package/src/browser/type/clientRepository.ts +0 -22
- package/src/browser/type/index.ts +0 -4
- package/src/browser/type/request.ts +0 -25
- package/src/dialect/abstractDialect.ts +0 -28
- package/src/dialect/abstractSqlDialect-spec.ts +0 -1309
- package/src/dialect/abstractSqlDialect.ts +0 -805
- package/src/dialect/index.ts +0 -3
- package/src/dialect/namingStrategy.spec.ts +0 -52
- package/src/dialect/queryContext.ts +0 -69
- package/src/entity/decorator/definition.spec.ts +0 -736
- package/src/entity/decorator/definition.ts +0 -265
- package/src/entity/decorator/entity.ts +0 -8
- package/src/entity/decorator/field.ts +0 -9
- package/src/entity/decorator/id.ts +0 -9
- package/src/entity/decorator/index.ts +0 -5
- package/src/entity/decorator/relation.spec.ts +0 -41
- package/src/entity/decorator/relation.ts +0 -34
- package/src/entity/index.ts +0 -1
- package/src/express/@types/express.d.ts +0 -8
- package/src/express/@types/index.d.ts +0 -1
- package/src/express/index.ts +0 -2
- package/src/express/querierMiddleware.ts +0 -217
- package/src/express/query.util.spec.ts +0 -40
- package/src/express/query.util.ts +0 -21
- package/src/index.ts +0 -9
- package/src/maria/index.ts +0 -3
- package/src/maria/mariaDialect.spec.ts +0 -207
- package/src/maria/mariaDialect.ts +0 -42
- package/src/maria/mariaQuerierPool.test.ts +0 -23
- package/src/maria/mariadbQuerier.test.ts +0 -23
- package/src/maria/mariadbQuerier.ts +0 -45
- package/src/maria/mariadbQuerierPool.ts +0 -21
- package/src/migrate/cli.ts +0 -301
- package/src/migrate/generator/index.ts +0 -4
- package/src/migrate/generator/mongoSchemaGenerator.spec.ts +0 -112
- package/src/migrate/generator/mongoSchemaGenerator.ts +0 -115
- package/src/migrate/generator/mysqlSchemaGenerator.spec.ts +0 -34
- package/src/migrate/generator/mysqlSchemaGenerator.ts +0 -92
- package/src/migrate/generator/postgresSchemaGenerator.spec.ts +0 -44
- package/src/migrate/generator/postgresSchemaGenerator.ts +0 -127
- package/src/migrate/generator/sqliteSchemaGenerator.spec.ts +0 -33
- package/src/migrate/generator/sqliteSchemaGenerator.ts +0 -81
- package/src/migrate/index.ts +0 -41
- package/src/migrate/introspection/index.ts +0 -4
- package/src/migrate/introspection/mongoIntrospector.spec.ts +0 -75
- package/src/migrate/introspection/mongoIntrospector.ts +0 -47
- package/src/migrate/introspection/mysqlIntrospector.spec.ts +0 -113
- package/src/migrate/introspection/mysqlIntrospector.ts +0 -278
- package/src/migrate/introspection/postgresIntrospector.spec.ts +0 -112
- package/src/migrate/introspection/postgresIntrospector.ts +0 -329
- package/src/migrate/introspection/sqliteIntrospector.spec.ts +0 -112
- package/src/migrate/introspection/sqliteIntrospector.ts +0 -296
- package/src/migrate/migrator-mongo.test.ts +0 -54
- package/src/migrate/migrator.spec.ts +0 -255
- package/src/migrate/migrator.test.ts +0 -94
- package/src/migrate/migrator.ts +0 -719
- package/src/migrate/namingStrategy.spec.ts +0 -22
- package/src/migrate/schemaGenerator-advanced.spec.ts +0 -138
- package/src/migrate/schemaGenerator.spec.ts +0 -190
- package/src/migrate/schemaGenerator.ts +0 -478
- package/src/migrate/storage/databaseStorage.spec.ts +0 -69
- package/src/migrate/storage/databaseStorage.ts +0 -100
- package/src/migrate/storage/index.ts +0 -2
- package/src/migrate/storage/jsonStorage.ts +0 -58
- package/src/migrate/type.ts +0 -1
- package/src/mongo/index.ts +0 -3
- package/src/mongo/mongoDialect.spec.ts +0 -251
- package/src/mongo/mongoDialect.ts +0 -238
- package/src/mongo/mongodbQuerier.test.ts +0 -45
- package/src/mongo/mongodbQuerier.ts +0 -256
- package/src/mongo/mongodbQuerierPool.test.ts +0 -25
- package/src/mongo/mongodbQuerierPool.ts +0 -24
- package/src/mysql/index.ts +0 -3
- package/src/mysql/mysql2Querier.test.ts +0 -20
- package/src/mysql/mysql2Querier.ts +0 -49
- package/src/mysql/mysql2QuerierPool.test.ts +0 -20
- package/src/mysql/mysql2QuerierPool.ts +0 -21
- package/src/mysql/mysqlDialect.spec.ts +0 -20
- package/src/mysql/mysqlDialect.ts +0 -16
- package/src/namingStrategy/defaultNamingStrategy.ts +0 -18
- package/src/namingStrategy/index.spec.ts +0 -36
- package/src/namingStrategy/index.ts +0 -2
- package/src/namingStrategy/snakeCaseNamingStrategy.ts +0 -15
- package/src/options.spec.ts +0 -41
- package/src/options.ts +0 -18
- package/src/postgres/index.ts +0 -3
- package/src/postgres/manual-types.d.ts +0 -4
- package/src/postgres/pgQuerier.test.ts +0 -25
- package/src/postgres/pgQuerier.ts +0 -45
- package/src/postgres/pgQuerierPool.test.ts +0 -28
- package/src/postgres/pgQuerierPool.ts +0 -21
- package/src/postgres/postgresDialect.spec.ts +0 -428
- package/src/postgres/postgresDialect.ts +0 -144
- package/src/querier/abstractQuerier-test.ts +0 -584
- package/src/querier/abstractQuerier.ts +0 -353
- package/src/querier/abstractQuerierPool-test.ts +0 -20
- package/src/querier/abstractQuerierPool.ts +0 -18
- package/src/querier/abstractSqlQuerier-spec.ts +0 -979
- package/src/querier/abstractSqlQuerier-test.ts +0 -21
- package/src/querier/abstractSqlQuerier.ts +0 -138
- package/src/querier/decorator/index.ts +0 -3
- package/src/querier/decorator/injectQuerier.spec.ts +0 -74
- package/src/querier/decorator/injectQuerier.ts +0 -45
- package/src/querier/decorator/serialized.spec.ts +0 -98
- package/src/querier/decorator/serialized.ts +0 -13
- package/src/querier/decorator/transactional.spec.ts +0 -240
- package/src/querier/decorator/transactional.ts +0 -56
- package/src/querier/index.ts +0 -4
- package/src/repository/genericRepository.spec.ts +0 -111
- package/src/repository/genericRepository.ts +0 -74
- package/src/repository/index.ts +0 -1
- package/src/sqlite/index.ts +0 -3
- package/src/sqlite/manual-types.d.ts +0 -4
- package/src/sqlite/sqliteDialect.spec.ts +0 -155
- package/src/sqlite/sqliteDialect.ts +0 -76
- package/src/sqlite/sqliteQuerier.spec.ts +0 -36
- package/src/sqlite/sqliteQuerier.test.ts +0 -21
- package/src/sqlite/sqliteQuerier.ts +0 -37
- package/src/sqlite/sqliteQuerierPool.test.ts +0 -12
- package/src/sqlite/sqliteQuerierPool.ts +0 -38
- package/src/test/entityMock.ts +0 -375
- package/src/test/index.ts +0 -3
- package/src/test/it.util.ts +0 -69
- package/src/test/spec.util.ts +0 -57
- package/src/type/entity.ts +0 -218
- package/src/type/index.ts +0 -9
- package/src/type/migration.ts +0 -241
- package/src/type/namingStrategy.ts +0 -17
- package/src/type/querier.ts +0 -143
- package/src/type/querierPool.ts +0 -26
- package/src/type/query.ts +0 -506
- package/src/type/repository.ts +0 -142
- package/src/type/universalQuerier.ts +0 -133
- package/src/type/utility.ts +0 -21
- package/src/util/dialect.util-extra.spec.ts +0 -96
- package/src/util/dialect.util.spec.ts +0 -23
- package/src/util/dialect.util.ts +0 -134
- package/src/util/index.ts +0 -5
- package/src/util/object.util.spec.ts +0 -29
- package/src/util/object.util.ts +0 -27
- package/src/util/raw.ts +0 -11
- package/src/util/sql.util-extra.spec.ts +0 -17
- package/src/util/sql.util.spec.ts +0 -208
- package/src/util/sql.util.ts +0 -104
- package/src/util/string.util.spec.ts +0 -46
- package/src/util/string.util.ts +0 -35
- package/tsconfig.build.json +0 -5
- package/tsconfig.json +0 -8
- /package/{dist/README.md → README.md} +0 -0
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
import { createTables, dropTables } from '../test/index.js';
|
|
2
|
-
import type { QuerierPool } from '../type/index.js';
|
|
3
|
-
import { AbstractQuerierIt } from './abstractQuerier-test.js';
|
|
4
|
-
import type { AbstractSqlQuerier } from './abstractSqlQuerier.js';
|
|
5
|
-
|
|
6
|
-
export abstract class AbstractSqlQuerierIt extends AbstractQuerierIt<AbstractSqlQuerier> {
|
|
7
|
-
constructor(
|
|
8
|
-
pool: QuerierPool<AbstractSqlQuerier>,
|
|
9
|
-
readonly idType: string,
|
|
10
|
-
) {
|
|
11
|
-
super(pool);
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
override createTables() {
|
|
15
|
-
return createTables(this.querier, this.idType);
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
override dropTables() {
|
|
19
|
-
return dropTables(this.querier);
|
|
20
|
-
}
|
|
21
|
-
}
|
|
@@ -1,138 +0,0 @@
|
|
|
1
|
-
import type { AbstractSqlDialect } from '../dialect/index.js';
|
|
2
|
-
import { getMeta } from '../entity/index.js';
|
|
3
|
-
import type {
|
|
4
|
-
Query,
|
|
5
|
-
QueryConflictPaths,
|
|
6
|
-
QueryOptions,
|
|
7
|
-
QuerySearch,
|
|
8
|
-
QueryUpdateResult,
|
|
9
|
-
SqlQuerier,
|
|
10
|
-
Type,
|
|
11
|
-
} from '../type/index.js';
|
|
12
|
-
import { clone, unflatObjects } from '../util/index.js';
|
|
13
|
-
import { AbstractQuerier } from './abstractQuerier.js';
|
|
14
|
-
import { Serialized } from './decorator/index.js';
|
|
15
|
-
|
|
16
|
-
export abstract class AbstractSqlQuerier extends AbstractQuerier implements SqlQuerier {
|
|
17
|
-
private hasPendingTransaction?: boolean;
|
|
18
|
-
|
|
19
|
-
constructor(readonly dialect: AbstractSqlDialect) {
|
|
20
|
-
super();
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
/**
|
|
24
|
-
* internal read query.
|
|
25
|
-
*/
|
|
26
|
-
protected abstract internalAll<T>(query: string, values?: unknown[]): Promise<T[]>;
|
|
27
|
-
|
|
28
|
-
/**
|
|
29
|
-
* internal insert/update/delete/ddl query.
|
|
30
|
-
*/
|
|
31
|
-
protected abstract internalRun(query: string, values?: unknown[]): Promise<QueryUpdateResult>;
|
|
32
|
-
|
|
33
|
-
@Serialized()
|
|
34
|
-
async all<T>(query: string, values?: unknown[]): Promise<T[]> {
|
|
35
|
-
return this.internalAll<T>(query, values);
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
@Serialized()
|
|
39
|
-
async run(query: string, values?: unknown[]): Promise<QueryUpdateResult> {
|
|
40
|
-
return this.internalRun(query, values);
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
override async findMany<E>(entity: Type<E>, q: Query<E>) {
|
|
44
|
-
const ctx = this.dialect.createContext();
|
|
45
|
-
this.dialect.find(ctx, entity, q);
|
|
46
|
-
const res = await this.all<E>(ctx.sql, ctx.values);
|
|
47
|
-
const founds = unflatObjects(res);
|
|
48
|
-
await this.fillToManyRelations(entity, founds, q.$select);
|
|
49
|
-
return founds;
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
override async count<E>(entity: Type<E>, q: QuerySearch<E> = {}) {
|
|
53
|
-
const ctx = this.dialect.createContext();
|
|
54
|
-
this.dialect.count(ctx, entity, q);
|
|
55
|
-
const res = await this.all<{ count: number }>(ctx.sql, ctx.values);
|
|
56
|
-
return Number(res[0].count);
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
override async insertMany<E>(entity: Type<E>, payload: E[]) {
|
|
60
|
-
if (!payload?.length) {
|
|
61
|
-
return [];
|
|
62
|
-
}
|
|
63
|
-
payload = clone(payload);
|
|
64
|
-
const ctx = this.dialect.createContext();
|
|
65
|
-
this.dialect.insert(ctx, entity, payload);
|
|
66
|
-
const { ids } = await this.run(ctx.sql, ctx.values);
|
|
67
|
-
const meta = getMeta(entity);
|
|
68
|
-
const payloadIds = payload.map((it, index) => {
|
|
69
|
-
it[meta.id as string] ??= ids[index];
|
|
70
|
-
return it[meta.id];
|
|
71
|
-
});
|
|
72
|
-
await this.insertRelations(entity, payload);
|
|
73
|
-
return payloadIds;
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
override async updateMany<E>(entity: Type<E>, q: QuerySearch<E>, payload: E) {
|
|
77
|
-
payload = clone(payload);
|
|
78
|
-
const ctx = this.dialect.createContext();
|
|
79
|
-
this.dialect.update(ctx, entity, q, payload);
|
|
80
|
-
const { changes } = await this.run(ctx.sql, ctx.values);
|
|
81
|
-
await this.updateRelations(entity, q, payload);
|
|
82
|
-
return changes;
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
override async upsertOne<E>(entity: Type<E>, conflictPaths: QueryConflictPaths<E>, payload: E) {
|
|
86
|
-
payload = clone(payload);
|
|
87
|
-
const ctx = this.dialect.createContext();
|
|
88
|
-
this.dialect.upsert(ctx, entity, conflictPaths, payload);
|
|
89
|
-
return this.run(ctx.sql, ctx.values);
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
override async deleteMany<E>(entity: Type<E>, q: QuerySearch<E>, opts?: QueryOptions) {
|
|
93
|
-
const meta = getMeta(entity);
|
|
94
|
-
const findCtx = this.dialect.createContext();
|
|
95
|
-
this.dialect.find(findCtx, entity, { ...q, $select: [meta.id] });
|
|
96
|
-
const founds = await this.all<E>(findCtx.sql, findCtx.values);
|
|
97
|
-
if (!founds.length) {
|
|
98
|
-
return 0;
|
|
99
|
-
}
|
|
100
|
-
const ids = founds.map((it) => it[meta.id]);
|
|
101
|
-
const deleteCtx = this.dialect.createContext();
|
|
102
|
-
this.dialect.delete(deleteCtx, entity, { $where: ids }, opts);
|
|
103
|
-
const { changes } = await this.run(deleteCtx.sql, deleteCtx.values);
|
|
104
|
-
await this.deleteRelations(entity, ids, opts);
|
|
105
|
-
return changes;
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
override get hasOpenTransaction() {
|
|
109
|
-
return this.hasPendingTransaction;
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
@Serialized()
|
|
113
|
-
override async beginTransaction() {
|
|
114
|
-
if (this.hasPendingTransaction) {
|
|
115
|
-
throw TypeError('pending transaction');
|
|
116
|
-
}
|
|
117
|
-
await this.internalRun(this.dialect.beginTransactionCommand);
|
|
118
|
-
this.hasPendingTransaction = true;
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
@Serialized()
|
|
122
|
-
override async commitTransaction() {
|
|
123
|
-
if (!this.hasPendingTransaction) {
|
|
124
|
-
throw TypeError('not a pending transaction');
|
|
125
|
-
}
|
|
126
|
-
await this.internalRun(this.dialect.commitTransactionCommand);
|
|
127
|
-
this.hasPendingTransaction = false;
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
@Serialized()
|
|
131
|
-
override async rollbackTransaction() {
|
|
132
|
-
if (!this.hasPendingTransaction) {
|
|
133
|
-
throw TypeError('not a pending transaction');
|
|
134
|
-
}
|
|
135
|
-
await this.internalRun(this.dialect.rollbackTransactionCommand);
|
|
136
|
-
this.hasPendingTransaction = false;
|
|
137
|
-
}
|
|
138
|
-
}
|
|
@@ -1,74 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it } from 'bun:test';
|
|
2
|
-
import type { Querier } from '../../type/index.js';
|
|
3
|
-
import { getInjectedQuerierIndex, InjectQuerier } from './injectQuerier.js';
|
|
4
|
-
|
|
5
|
-
describe('injectQuerier', () => {
|
|
6
|
-
it('no inject', () => {
|
|
7
|
-
class ServiceA {
|
|
8
|
-
save() {}
|
|
9
|
-
|
|
10
|
-
hello(param1: string, someQuerier?: Querier) {}
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
expect(getInjectedQuerierIndex(ServiceA, 'save')).toBe(undefined);
|
|
14
|
-
expect(getInjectedQuerierIndex(ServiceA, 'hello')).toBe(undefined);
|
|
15
|
-
});
|
|
16
|
-
|
|
17
|
-
it('one', () => {
|
|
18
|
-
class ServiceA {
|
|
19
|
-
save(@InjectQuerier() someQuerier?: Querier) {}
|
|
20
|
-
|
|
21
|
-
update(param1: string, @InjectQuerier() someQuerier?: Querier) {}
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
expect(getInjectedQuerierIndex(ServiceA, 'save')).toBe(0);
|
|
25
|
-
expect(getInjectedQuerierIndex(ServiceA, 'update')).toBe(1);
|
|
26
|
-
});
|
|
27
|
-
|
|
28
|
-
it('inheritance', () => {
|
|
29
|
-
class ServiceA {
|
|
30
|
-
save(@InjectQuerier() someQuerier?: Querier) {}
|
|
31
|
-
}
|
|
32
|
-
class ServiceB extends ServiceA {}
|
|
33
|
-
class ServiceC extends ServiceB {
|
|
34
|
-
hello(@InjectQuerier() someQuerier?: Querier) {}
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
class ServiceD extends ServiceC {}
|
|
38
|
-
|
|
39
|
-
class ServiceE extends ServiceB {}
|
|
40
|
-
|
|
41
|
-
expect(getInjectedQuerierIndex(ServiceA, 'save')).toBe(0);
|
|
42
|
-
expect(getInjectedQuerierIndex(ServiceB, 'save')).toBe(0);
|
|
43
|
-
expect(getInjectedQuerierIndex(ServiceC, 'save')).toBe(0);
|
|
44
|
-
expect(getInjectedQuerierIndex(ServiceC, 'hello')).toBe(0);
|
|
45
|
-
expect(getInjectedQuerierIndex(ServiceD, 'save')).toBe(0);
|
|
46
|
-
expect(getInjectedQuerierIndex(ServiceC, 'hello')).toBe(0);
|
|
47
|
-
expect(getInjectedQuerierIndex(ServiceE, 'save')).toBe(0);
|
|
48
|
-
});
|
|
49
|
-
|
|
50
|
-
it('inheritance - overridden', () => {
|
|
51
|
-
class ServiceA {
|
|
52
|
-
save(@InjectQuerier() someQuerier?: Querier) {}
|
|
53
|
-
}
|
|
54
|
-
class ServiceB extends ServiceA {
|
|
55
|
-
override save(someQuerier?: Querier) {}
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
class ServiceC extends ServiceA {
|
|
59
|
-
override save(@InjectQuerier() someQuerier?: Querier) {}
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
expect(getInjectedQuerierIndex(ServiceA, 'save')).toBe(0);
|
|
63
|
-
expect(getInjectedQuerierIndex(ServiceB, 'save')).toBe(undefined);
|
|
64
|
-
expect(getInjectedQuerierIndex(ServiceC, 'save')).toBe(0);
|
|
65
|
-
});
|
|
66
|
-
|
|
67
|
-
it('prevent duplicated injection', () => {
|
|
68
|
-
expect(() => {
|
|
69
|
-
class ServiceA {
|
|
70
|
-
save(@InjectQuerier() someQuerier?: Querier, @InjectQuerier() anotherQuerier?: Querier) {}
|
|
71
|
-
}
|
|
72
|
-
}).toThrow("@InjectQuerier() can only appears once in 'ServiceA.save'");
|
|
73
|
-
});
|
|
74
|
-
});
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
import type { Key, Primitive, Type } from '../../type/index.js';
|
|
2
|
-
|
|
3
|
-
const metadataKey = Symbol('InjectQuerier');
|
|
4
|
-
|
|
5
|
-
export function InjectQuerier() {
|
|
6
|
-
return (proto: Record<Primitive, any>, key: string, index: number) => {
|
|
7
|
-
if (!proto[metadataKey]) {
|
|
8
|
-
proto[metadataKey] = new WeakMap();
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
if (!proto[metadataKey].has(proto.constructor)) {
|
|
12
|
-
proto[metadataKey].set(proto.constructor, {});
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
const meta = proto[metadataKey].get(proto.constructor);
|
|
16
|
-
const isAlreadyInjected = key in meta;
|
|
17
|
-
|
|
18
|
-
if (isAlreadyInjected) {
|
|
19
|
-
throw new TypeError(`@InjectQuerier() can only appears once in '${proto.constructor.name}.${key}'}`);
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
meta[key] = index;
|
|
23
|
-
};
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
export function getInjectedQuerierIndex<S>(service: Type<S>, key: Key<S>) {
|
|
27
|
-
let proto = service.prototype;
|
|
28
|
-
|
|
29
|
-
while (proto.constructor !== Object) {
|
|
30
|
-
const meta = proto[metadataKey]?.get(proto.constructor);
|
|
31
|
-
|
|
32
|
-
if (meta && key in meta) {
|
|
33
|
-
return meta[key];
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
const keys = Object.getOwnPropertyNames(proto) as Key<S>[];
|
|
37
|
-
const isOwnKey = keys.includes(key);
|
|
38
|
-
|
|
39
|
-
if (isOwnKey) {
|
|
40
|
-
return;
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
proto = Object.getPrototypeOf(proto);
|
|
44
|
-
}
|
|
45
|
-
}
|
|
@@ -1,98 +0,0 @@
|
|
|
1
|
-
import { expect, test } from 'bun:test';
|
|
2
|
-
import { AbstractQuerier } from '../abstractQuerier.js';
|
|
3
|
-
import { Serialized } from './serialized.js';
|
|
4
|
-
|
|
5
|
-
class MockQuerier extends AbstractQuerier {
|
|
6
|
-
activeCount = 0;
|
|
7
|
-
maxConcurrency = 0;
|
|
8
|
-
executionOrder: number[] = [];
|
|
9
|
-
|
|
10
|
-
@Serialized()
|
|
11
|
-
async slowMethod(id: number, delay: number) {
|
|
12
|
-
this.activeCount++;
|
|
13
|
-
this.maxConcurrency = Math.max(this.maxConcurrency, this.activeCount);
|
|
14
|
-
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
15
|
-
this.executionOrder.push(id);
|
|
16
|
-
this.activeCount--;
|
|
17
|
-
return id;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
// Abstract methods required by AbstractQuerier
|
|
21
|
-
findMany(): any {}
|
|
22
|
-
count(): any {}
|
|
23
|
-
insertMany(): any {}
|
|
24
|
-
updateMany(): any {}
|
|
25
|
-
upsertOne(): any {}
|
|
26
|
-
deleteMany(): any {}
|
|
27
|
-
beginTransaction(): any {}
|
|
28
|
-
commitTransaction(): any {}
|
|
29
|
-
rollbackTransaction(): any {}
|
|
30
|
-
protected internalRelease(): any {}
|
|
31
|
-
hasOpenTransaction = false;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
test('Serialized decorator executes tasks sequentially', async () => {
|
|
35
|
-
const querier = new MockQuerier();
|
|
36
|
-
// Fire 3 "parallel" calls
|
|
37
|
-
const results = await Promise.all([querier.slowMethod(1, 100), querier.slowMethod(2, 50), querier.slowMethod(3, 10)]);
|
|
38
|
-
// Even though 3 finished faster, it should be last because it was queued last
|
|
39
|
-
expect(results).toEqual([1, 2, 3]);
|
|
40
|
-
expect(querier.executionOrder).toEqual([1, 2, 3]);
|
|
41
|
-
// CRITICAL: Max concurrency must be 1
|
|
42
|
-
expect(querier.maxConcurrency).toBe(1);
|
|
43
|
-
});
|
|
44
|
-
|
|
45
|
-
test('Serialized decorator advances queue even on failure', async () => {
|
|
46
|
-
class FailingQuerier extends MockQuerier {
|
|
47
|
-
@Serialized()
|
|
48
|
-
async failingMethod() {
|
|
49
|
-
throw new Error('boom');
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
const querier = new FailingQuerier();
|
|
54
|
-
const promise1 = querier.failingMethod();
|
|
55
|
-
const promise2 = querier.slowMethod(2, 10);
|
|
56
|
-
await expect(promise1).rejects.toThrow('boom');
|
|
57
|
-
const result2 = await promise2;
|
|
58
|
-
expect(result2).toBe(2);
|
|
59
|
-
expect(querier.executionOrder).toEqual([2]);
|
|
60
|
-
});
|
|
61
|
-
|
|
62
|
-
test('Demonstrate deadlock when a @Serialized method calls another @Serialized method', async () => {
|
|
63
|
-
class DeadlockQuerier extends MockQuerier {
|
|
64
|
-
@Serialized()
|
|
65
|
-
async outer() {
|
|
66
|
-
return this.inner();
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
@Serialized()
|
|
70
|
-
async inner() {
|
|
71
|
-
return 'done';
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
const querier = new DeadlockQuerier();
|
|
76
|
-
|
|
77
|
-
// We expect this to deadlock/timeout because 'outer' holds the queue and waits for 'inner',
|
|
78
|
-
// but 'inner' is waiting for the queue to be free.
|
|
79
|
-
const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error('DEADLOCK')), 500));
|
|
80
|
-
|
|
81
|
-
await expect(Promise.race([querier.outer(), timeoutPromise])).rejects.toThrow('DEADLOCK');
|
|
82
|
-
});
|
|
83
|
-
|
|
84
|
-
test('Proper solution: @Serialized method calls a non-decorated internal method', async () => {
|
|
85
|
-
class SafeQuerier extends MockQuerier {
|
|
86
|
-
@Serialized()
|
|
87
|
-
async publicMethod() {
|
|
88
|
-
return this.internalMethod();
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
async internalMethod() {
|
|
92
|
-
return 'safe';
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
const querier = new SafeQuerier();
|
|
97
|
-
await expect(querier.publicMethod()).resolves.toBe('safe');
|
|
98
|
-
});
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Decorator that ensures the decorated method is executed serially within the Querier instance.
|
|
3
|
-
* It uses a private promise queue to prevent race conditions on the database connection.
|
|
4
|
-
* Note: The decorated class must extend AbstractQuerier or implement a compatible serialize method.
|
|
5
|
-
*/
|
|
6
|
-
export function Serialized() {
|
|
7
|
-
return (_target: object, _key: string, propDescriptor: PropertyDescriptor): void => {
|
|
8
|
-
const originalMethod = propDescriptor.value;
|
|
9
|
-
propDescriptor.value = function (this: any, ...args: any[]) {
|
|
10
|
-
return this.serialize(() => originalMethod.apply(this, args));
|
|
11
|
-
};
|
|
12
|
-
};
|
|
13
|
-
}
|
|
@@ -1,240 +0,0 @@
|
|
|
1
|
-
import { beforeEach, describe, expect, it, jest } from 'bun:test';
|
|
2
|
-
import { getQuerier, setQuerierPool } from '../../options.js';
|
|
3
|
-
import type { Querier, QuerierPool, Writable } from '../../type/index.js';
|
|
4
|
-
import { InjectQuerier } from './injectQuerier.js';
|
|
5
|
-
import { Transactional } from './transactional.js';
|
|
6
|
-
|
|
7
|
-
describe('transactional', () => {
|
|
8
|
-
let anotherQuerierPool: QuerierPool;
|
|
9
|
-
|
|
10
|
-
beforeEach(() => {
|
|
11
|
-
const querierSingleton = buildQuerierMock();
|
|
12
|
-
const anotherQuerierSingleton = buildQuerierMock();
|
|
13
|
-
|
|
14
|
-
setQuerierPool({
|
|
15
|
-
getQuerier: async () => querierSingleton,
|
|
16
|
-
end: async () => undefined,
|
|
17
|
-
dialect: 'postgres',
|
|
18
|
-
});
|
|
19
|
-
|
|
20
|
-
anotherQuerierPool = {
|
|
21
|
-
getQuerier: async () => anotherQuerierSingleton,
|
|
22
|
-
end: async () => undefined,
|
|
23
|
-
dialect: 'postgres',
|
|
24
|
-
};
|
|
25
|
-
});
|
|
26
|
-
|
|
27
|
-
it('injectQuerier', async () => {
|
|
28
|
-
class ServiceA {
|
|
29
|
-
@Transactional()
|
|
30
|
-
async save(@InjectQuerier() querier?: Querier) {}
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
const serviceA = new ServiceA();
|
|
34
|
-
await serviceA.save();
|
|
35
|
-
|
|
36
|
-
const querier = await getQuerier();
|
|
37
|
-
|
|
38
|
-
expect(querier.beginTransaction).toHaveBeenCalledTimes(1);
|
|
39
|
-
expect(querier.commitTransaction).toHaveBeenCalledTimes(1);
|
|
40
|
-
expect(querier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
41
|
-
expect(querier.release).toHaveBeenCalledTimes(1);
|
|
42
|
-
|
|
43
|
-
const anotherQuerier = await anotherQuerierPool.getQuerier();
|
|
44
|
-
|
|
45
|
-
expect(anotherQuerier.beginTransaction).toHaveBeenCalledTimes(0);
|
|
46
|
-
expect(anotherQuerier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
47
|
-
expect(anotherQuerier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
48
|
-
expect(anotherQuerier.release).toHaveBeenCalledTimes(0);
|
|
49
|
-
});
|
|
50
|
-
|
|
51
|
-
it('injectQuerier - querier and repositories', async () => {
|
|
52
|
-
class ServiceA {
|
|
53
|
-
@Transactional()
|
|
54
|
-
async save(@InjectQuerier() querier?: Querier) {}
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
const serviceA = new ServiceA();
|
|
58
|
-
await serviceA.save();
|
|
59
|
-
|
|
60
|
-
const querier = await getQuerier();
|
|
61
|
-
|
|
62
|
-
expect(querier.beginTransaction).toHaveBeenCalledTimes(1);
|
|
63
|
-
expect(querier.commitTransaction).toHaveBeenCalledTimes(1);
|
|
64
|
-
expect(querier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
65
|
-
expect(querier.release).toHaveBeenCalledTimes(1);
|
|
66
|
-
|
|
67
|
-
const anotherQuerier = await anotherQuerierPool.getQuerier();
|
|
68
|
-
|
|
69
|
-
expect(anotherQuerier.beginTransaction).toHaveBeenCalledTimes(0);
|
|
70
|
-
expect(anotherQuerier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
71
|
-
expect(anotherQuerier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
72
|
-
expect(anotherQuerier.release).toHaveBeenCalledTimes(0);
|
|
73
|
-
});
|
|
74
|
-
|
|
75
|
-
it('injectQuerier propagation: supported', async () => {
|
|
76
|
-
class ServiceA {
|
|
77
|
-
@Transactional({ propagation: 'supported' })
|
|
78
|
-
async find(@InjectQuerier() querier?: Querier) {}
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
const serviceA = new ServiceA();
|
|
82
|
-
await serviceA.find();
|
|
83
|
-
|
|
84
|
-
const querier = await getQuerier();
|
|
85
|
-
|
|
86
|
-
expect(querier.beginTransaction).toHaveBeenCalledTimes(0);
|
|
87
|
-
expect(querier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
88
|
-
expect(querier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
89
|
-
expect(querier.release).toHaveBeenCalledTimes(1);
|
|
90
|
-
|
|
91
|
-
const anotherQuerier = await anotherQuerierPool.getQuerier();
|
|
92
|
-
|
|
93
|
-
expect(anotherQuerier.beginTransaction).toHaveBeenCalledTimes(0);
|
|
94
|
-
expect(anotherQuerier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
95
|
-
expect(anotherQuerier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
96
|
-
expect(anotherQuerier.release).toHaveBeenCalledTimes(0);
|
|
97
|
-
});
|
|
98
|
-
|
|
99
|
-
it('injectQuerier another querierPool', async () => {
|
|
100
|
-
class ServiceA {
|
|
101
|
-
@Transactional({ querierPool: anotherQuerierPool })
|
|
102
|
-
async save(@InjectQuerier() querier?: Querier) {}
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
const serviceA = new ServiceA();
|
|
106
|
-
await serviceA.save();
|
|
107
|
-
|
|
108
|
-
const anotherQuerier = await anotherQuerierPool.getQuerier();
|
|
109
|
-
|
|
110
|
-
expect(anotherQuerier.beginTransaction).toHaveBeenCalledTimes(1);
|
|
111
|
-
expect(anotherQuerier.commitTransaction).toHaveBeenCalledTimes(1);
|
|
112
|
-
expect(anotherQuerier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
113
|
-
expect(anotherQuerier.release).toHaveBeenCalledTimes(1);
|
|
114
|
-
|
|
115
|
-
const querier = await getQuerier();
|
|
116
|
-
|
|
117
|
-
expect(querier.beginTransaction).toHaveBeenCalledTimes(0);
|
|
118
|
-
expect(querier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
119
|
-
expect(querier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
120
|
-
expect(querier.release).toHaveBeenCalledTimes(0);
|
|
121
|
-
});
|
|
122
|
-
|
|
123
|
-
it('injectQuerier and call super', async () => {
|
|
124
|
-
const deleteStub = jest.fn((id: string, querier: Querier) => {});
|
|
125
|
-
|
|
126
|
-
class ServiceA {
|
|
127
|
-
@Transactional()
|
|
128
|
-
async delete(id: string, @InjectQuerier() querier?: Querier) {
|
|
129
|
-
deleteStub(id, querier);
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
class ServiceB extends ServiceA {
|
|
134
|
-
@Transactional({ querierPool: anotherQuerierPool })
|
|
135
|
-
override async delete(id: string, @InjectQuerier() querier?: Querier) {
|
|
136
|
-
return super.delete(id, querier);
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
const serviceB = new ServiceB();
|
|
141
|
-
await serviceB.delete('123');
|
|
142
|
-
|
|
143
|
-
const querier = await getQuerier();
|
|
144
|
-
|
|
145
|
-
expect(deleteStub).toHaveBeenCalledTimes(1);
|
|
146
|
-
|
|
147
|
-
const anotherQuerier = await anotherQuerierPool.getQuerier();
|
|
148
|
-
|
|
149
|
-
expect(deleteStub).toHaveBeenCalledWith('123', anotherQuerier);
|
|
150
|
-
|
|
151
|
-
expect(anotherQuerier.beginTransaction).toHaveBeenCalledTimes(1);
|
|
152
|
-
expect(anotherQuerier.commitTransaction).toHaveBeenCalledTimes(1);
|
|
153
|
-
expect(anotherQuerier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
154
|
-
expect(anotherQuerier.release).toHaveBeenCalledTimes(1);
|
|
155
|
-
|
|
156
|
-
expect(querier.beginTransaction).toHaveBeenCalledTimes(0);
|
|
157
|
-
expect(querier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
158
|
-
expect(querier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
159
|
-
expect(querier.release).toHaveBeenCalledTimes(0);
|
|
160
|
-
});
|
|
161
|
-
|
|
162
|
-
it('throw', async () => {
|
|
163
|
-
class ServiceA {
|
|
164
|
-
@Transactional({ propagation: 'supported' })
|
|
165
|
-
async save(@InjectQuerier() querier?: Querier) {
|
|
166
|
-
throw new Error('Some Error');
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
const serviceA = new ServiceA();
|
|
171
|
-
|
|
172
|
-
await expect(serviceA.save()).rejects.toThrow('Some Error');
|
|
173
|
-
|
|
174
|
-
const querier = await getQuerier();
|
|
175
|
-
|
|
176
|
-
expect(querier.beginTransaction).toHaveBeenCalledTimes(0);
|
|
177
|
-
expect(querier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
178
|
-
expect(querier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
179
|
-
expect(querier.release).toHaveBeenCalledTimes(1);
|
|
180
|
-
|
|
181
|
-
const anotherQuerier = await anotherQuerierPool.getQuerier();
|
|
182
|
-
|
|
183
|
-
expect(anotherQuerier.beginTransaction).toHaveBeenCalledTimes(0);
|
|
184
|
-
expect(anotherQuerier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
185
|
-
expect(anotherQuerier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
186
|
-
expect(anotherQuerier.release).toHaveBeenCalledTimes(0);
|
|
187
|
-
});
|
|
188
|
-
|
|
189
|
-
it('throw inside transaction', async () => {
|
|
190
|
-
class ServiceA {
|
|
191
|
-
@Transactional()
|
|
192
|
-
async save(@InjectQuerier() querier?: Querier) {
|
|
193
|
-
throw new Error('Some Error');
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
const serviceA = new ServiceA();
|
|
198
|
-
|
|
199
|
-
await expect(serviceA.save()).rejects.toThrow('Some Error');
|
|
200
|
-
|
|
201
|
-
const querier = await getQuerier();
|
|
202
|
-
|
|
203
|
-
expect(querier.beginTransaction).toHaveBeenCalledTimes(1);
|
|
204
|
-
expect(querier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
205
|
-
expect(querier.rollbackTransaction).toHaveBeenCalledTimes(1);
|
|
206
|
-
expect(querier.release).toHaveBeenCalledTimes(1);
|
|
207
|
-
|
|
208
|
-
const anotherQuerier = await anotherQuerierPool.getQuerier();
|
|
209
|
-
|
|
210
|
-
expect(anotherQuerier.beginTransaction).toHaveBeenCalledTimes(0);
|
|
211
|
-
expect(anotherQuerier.commitTransaction).toHaveBeenCalledTimes(0);
|
|
212
|
-
expect(anotherQuerier.rollbackTransaction).toHaveBeenCalledTimes(0);
|
|
213
|
-
expect(anotherQuerier.release).toHaveBeenCalledTimes(0);
|
|
214
|
-
});
|
|
215
|
-
|
|
216
|
-
it('missing injectQuerier', () => {
|
|
217
|
-
expect(() => {
|
|
218
|
-
class ServiceA {
|
|
219
|
-
@Transactional()
|
|
220
|
-
async find() {}
|
|
221
|
-
}
|
|
222
|
-
}).toThrow("missing decorator @InjectQuerier() in 'ServiceA.find'");
|
|
223
|
-
});
|
|
224
|
-
});
|
|
225
|
-
|
|
226
|
-
function buildQuerierMock(): Querier {
|
|
227
|
-
const querier = {
|
|
228
|
-
beginTransaction: jest.fn(async () => {
|
|
229
|
-
querier.hasOpenTransaction = true;
|
|
230
|
-
}),
|
|
231
|
-
commitTransaction: jest.fn(async () => {
|
|
232
|
-
querier.hasOpenTransaction = undefined;
|
|
233
|
-
}),
|
|
234
|
-
rollbackTransaction: jest.fn(async () => {
|
|
235
|
-
querier.hasOpenTransaction = undefined;
|
|
236
|
-
}),
|
|
237
|
-
release: jest.fn(async () => {}),
|
|
238
|
-
} as Partial<Querier> as Writable<Querier>;
|
|
239
|
-
return querier;
|
|
240
|
-
}
|
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
import { getQuerierPool } from '../../options.js';
|
|
2
|
-
import type { Querier, QuerierPool, Type } from '../../type/index.js';
|
|
3
|
-
import { getInjectedQuerierIndex } from './injectQuerier.js';
|
|
4
|
-
|
|
5
|
-
export function Transactional({
|
|
6
|
-
propagation = 'required',
|
|
7
|
-
querierPool,
|
|
8
|
-
}: {
|
|
9
|
-
readonly propagation?: 'supported' | 'required';
|
|
10
|
-
readonly querierPool?: QuerierPool;
|
|
11
|
-
} = {}) {
|
|
12
|
-
return (target: object, key: string, propDescriptor: PropertyDescriptor): void => {
|
|
13
|
-
const theClass = target.constructor as Type<any>;
|
|
14
|
-
const originalMethod = propDescriptor.value;
|
|
15
|
-
const injectedQuerierIndex = getInjectedQuerierIndex(theClass, key);
|
|
16
|
-
|
|
17
|
-
if (injectedQuerierIndex === undefined) {
|
|
18
|
-
throw TypeError(`missing decorator @InjectQuerier() in '${target.constructor.name}.${key}'`);
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
propDescriptor.value = async function func(this: object, ...args: any[]) {
|
|
22
|
-
const params = [...args];
|
|
23
|
-
let isOwnTransaction: boolean;
|
|
24
|
-
let querier: Querier;
|
|
25
|
-
|
|
26
|
-
if (params[injectedQuerierIndex]) {
|
|
27
|
-
querier = params[injectedQuerierIndex];
|
|
28
|
-
} else {
|
|
29
|
-
isOwnTransaction = true;
|
|
30
|
-
const pool = querierPool ?? getQuerierPool();
|
|
31
|
-
querier = await pool.getQuerier();
|
|
32
|
-
params[injectedQuerierIndex] = querier;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
try {
|
|
36
|
-
if (propagation === 'required' && !querier.hasOpenTransaction) {
|
|
37
|
-
await querier.beginTransaction();
|
|
38
|
-
}
|
|
39
|
-
const resp = await originalMethod.apply(this, params);
|
|
40
|
-
if (isOwnTransaction && querier.hasOpenTransaction) {
|
|
41
|
-
await querier.commitTransaction();
|
|
42
|
-
}
|
|
43
|
-
return resp;
|
|
44
|
-
} catch (err) {
|
|
45
|
-
if (isOwnTransaction && querier.hasOpenTransaction) {
|
|
46
|
-
await querier.rollbackTransaction();
|
|
47
|
-
}
|
|
48
|
-
throw err;
|
|
49
|
-
} finally {
|
|
50
|
-
if (isOwnTransaction) {
|
|
51
|
-
await querier.release();
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
};
|
|
55
|
-
};
|
|
56
|
-
}
|