@entity-access/entity-access 1.0.45 → 1.0.47
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/.vscode/launch.json +20 -1
- package/dist/common/Logger.d.ts +8 -1
- package/dist/common/Logger.d.ts.map +1 -1
- package/dist/common/Logger.js +18 -1
- package/dist/common/Logger.js.map +1 -1
- package/dist/common/ObjectPool.d.ts +42 -0
- package/dist/common/ObjectPool.d.ts.map +1 -0
- package/dist/common/ObjectPool.js +86 -0
- package/dist/common/ObjectPool.js.map +1 -0
- package/dist/common/sleep.d.ts +3 -0
- package/dist/common/sleep.d.ts.map +1 -0
- package/dist/common/sleep.js +17 -0
- package/dist/common/sleep.js.map +1 -0
- package/dist/decorators/Column.js +1 -1
- package/dist/decorators/Column.js.map +1 -1
- package/dist/di/di.d.ts +2 -2
- package/dist/di/di.d.ts.map +1 -1
- package/dist/di/di.js +33 -19
- package/dist/di/di.js.map +1 -1
- package/dist/drivers/base/BaseDriver.d.ts.map +1 -1
- package/dist/drivers/base/BaseDriver.js.map +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.d.ts +2 -2
- package/dist/drivers/postgres/PostgreSqlDriver.d.ts.map +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.js +54 -25
- package/dist/drivers/postgres/PostgreSqlDriver.js.map +1 -1
- package/dist/drivers/sql-server/ExpressionToSqlServer.d.ts +2 -1
- package/dist/drivers/sql-server/ExpressionToSqlServer.d.ts.map +1 -1
- package/dist/drivers/sql-server/ExpressionToSqlServer.js +3 -0
- package/dist/drivers/sql-server/ExpressionToSqlServer.js.map +1 -1
- package/dist/eternity/ActivitySuspendedError.d.ts +3 -0
- package/dist/eternity/ActivitySuspendedError.d.ts.map +1 -0
- package/dist/eternity/ActivitySuspendedError.js +3 -0
- package/dist/eternity/ActivitySuspendedError.js.map +1 -0
- package/dist/eternity/EternityContext.d.ts +27 -0
- package/dist/eternity/EternityContext.d.ts.map +1 -0
- package/dist/eternity/EternityContext.js +230 -0
- package/dist/eternity/EternityContext.js.map +1 -0
- package/dist/eternity/EternityStorage.d.ts +40 -0
- package/dist/eternity/EternityStorage.d.ts.map +1 -0
- package/dist/eternity/EternityStorage.js +217 -0
- package/dist/eternity/EternityStorage.js.map +1 -0
- package/dist/eternity/Workflow.d.ts +24 -0
- package/dist/eternity/Workflow.d.ts.map +1 -0
- package/dist/eternity/Workflow.js +49 -0
- package/dist/eternity/Workflow.js.map +1 -0
- package/dist/eternity/WorkflowClock.d.ts +5 -0
- package/dist/eternity/WorkflowClock.d.ts.map +1 -0
- package/dist/eternity/WorkflowClock.js +18 -0
- package/dist/eternity/WorkflowClock.js.map +1 -0
- package/dist/eternity/WorkflowRegistry.d.ts +13 -0
- package/dist/eternity/WorkflowRegistry.d.ts.map +1 -0
- package/dist/eternity/WorkflowRegistry.js +24 -0
- package/dist/eternity/WorkflowRegistry.js.map +1 -0
- package/dist/migrations/Migrations.d.ts.map +1 -1
- package/dist/migrations/Migrations.js +1 -0
- package/dist/migrations/Migrations.js.map +1 -1
- package/dist/model/EntityContext.d.ts +1 -1
- package/dist/model/EntityContext.d.ts.map +1 -1
- package/dist/model/EntityContext.js +2 -1
- package/dist/model/EntityContext.js.map +1 -1
- package/dist/model/EntityQuery.d.ts.map +1 -1
- package/dist/model/EntityQuery.js +1 -3
- package/dist/model/EntityQuery.js.map +1 -1
- package/dist/query/ast/DebugStringVisitor.d.ts +3 -1
- package/dist/query/ast/DebugStringVisitor.d.ts.map +1 -1
- package/dist/query/ast/DebugStringVisitor.js +6 -0
- package/dist/query/ast/DebugStringVisitor.js.map +1 -1
- package/dist/query/ast/ExpressionToSql.d.ts +3 -1
- package/dist/query/ast/ExpressionToSql.d.ts.map +1 -1
- package/dist/query/ast/ExpressionToSql.js +19 -3
- package/dist/query/ast/ExpressionToSql.js.map +1 -1
- package/dist/query/ast/Expressions.d.ts +10 -7
- package/dist/query/ast/Expressions.d.ts.map +1 -1
- package/dist/query/ast/Expressions.js +12 -4
- package/dist/query/ast/Expressions.js.map +1 -1
- package/dist/query/ast/Visitor.d.ts +3 -1
- package/dist/query/ast/Visitor.d.ts.map +1 -1
- package/dist/query/ast/Visitor.js +10 -0
- package/dist/query/ast/Visitor.js.map +1 -1
- package/dist/query/parser/ArrowToExpression.d.ts +2 -2
- package/dist/query/parser/ArrowToExpression.d.ts.map +1 -1
- package/dist/query/parser/ArrowToExpression.js +2 -2
- package/dist/query/parser/ArrowToExpression.js.map +1 -1
- package/dist/tests/eternity/eternity-tests.d.ts +3 -0
- package/dist/tests/eternity/eternity-tests.d.ts.map +1 -0
- package/dist/tests/eternity/eternity-tests.js +91 -0
- package/dist/tests/eternity/eternity-tests.js.map +1 -0
- package/dist/tests/security/tests/place-order.js +6 -2
- package/dist/tests/security/tests/place-order.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/common/Logger.ts +25 -2
- package/src/common/ObjectPool.ts +124 -0
- package/src/common/sleep.ts +16 -0
- package/src/decorators/Column.ts +1 -1
- package/src/di/di.ts +37 -20
- package/src/drivers/base/BaseDriver.ts +2 -1
- package/src/drivers/postgres/PostgreSqlDriver.ts +59 -32
- package/src/drivers/sql-server/ExpressionToSqlServer.ts +5 -1
- package/src/eternity/ActivitySuspendedError.ts +3 -0
- package/src/eternity/EternityContext.ts +254 -0
- package/src/eternity/EternityStorage.ts +180 -0
- package/src/eternity/Workflow.ts +55 -0
- package/src/eternity/WorkflowClock.ts +10 -0
- package/src/eternity/WorkflowRegistry.ts +34 -0
- package/src/migrations/Migrations.ts +2 -0
- package/src/model/EntityContext.ts +3 -2
- package/src/model/EntityQuery.ts +1 -2
- package/src/query/ast/DebugStringVisitor.ts +10 -1
- package/src/query/ast/ExpressionToSql.ts +22 -4
- package/src/query/ast/Expressions.ts +17 -5
- package/src/query/ast/Visitor.ts +11 -1
- package/src/query/parser/ArrowToExpression.ts +2 -2
- package/src/tests/eternity/eternity-tests.ts +108 -0
- package/src/tests/security/tests/place-order.ts +6 -2
- package/test.js +38 -3
package/.vscode/launch.json
CHANGED
|
@@ -7,11 +7,30 @@
|
|
|
7
7
|
{
|
|
8
8
|
"type": "node",
|
|
9
9
|
"request": "launch",
|
|
10
|
-
"name": "
|
|
10
|
+
"name": "Run All Tests",
|
|
11
11
|
"skipFiles": [
|
|
12
12
|
"<node_internals>/**"
|
|
13
13
|
],
|
|
14
14
|
"program": "${workspaceFolder}/test.js",
|
|
15
|
+
"args": [
|
|
16
|
+
],
|
|
17
|
+
"outFiles": [
|
|
18
|
+
"${workspaceFolder}/dist/**/*.js"
|
|
19
|
+
]
|
|
20
|
+
},
|
|
21
|
+
{
|
|
22
|
+
"type": "node",
|
|
23
|
+
"request": "launch",
|
|
24
|
+
"name": "Run Selected Test File",
|
|
25
|
+
"skipFiles": [
|
|
26
|
+
"<node_internals>/**"
|
|
27
|
+
],
|
|
28
|
+
"program": "${workspaceFolder}/test.js",
|
|
29
|
+
"args": [
|
|
30
|
+
"--test-file",
|
|
31
|
+
"./dist/tests/eternity/eternity-tests.js"
|
|
32
|
+
//,"${file}"
|
|
33
|
+
],
|
|
15
34
|
"outFiles": [
|
|
16
35
|
"${workspaceFolder}/dist/**/*.js"
|
|
17
36
|
]
|
package/dist/common/Logger.d.ts
CHANGED
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
import { IDisposable } from "./IDisposable.js";
|
|
2
2
|
export default class Logger implements IDisposable {
|
|
3
|
-
static
|
|
3
|
+
static nullLogger: Logger;
|
|
4
|
+
static get instance(): ConsoleLogger;
|
|
4
5
|
private static globalInstance;
|
|
5
6
|
log(a: any): this;
|
|
6
7
|
error(a: any): this;
|
|
7
8
|
newSession(): SessionLogger;
|
|
8
9
|
dispose(): void;
|
|
9
10
|
}
|
|
11
|
+
export declare class ConsoleLogger extends Logger {
|
|
12
|
+
log(a: any): this;
|
|
13
|
+
error(a: any): this;
|
|
14
|
+
newSession(): any;
|
|
15
|
+
dispose(): void;
|
|
16
|
+
}
|
|
10
17
|
declare class SessionLogger extends Logger {
|
|
11
18
|
private parent;
|
|
12
19
|
private items;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/common/Logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/C,MAAM,CAAC,OAAO,OAAO,MAAO,YAAW,WAAW;IAE9C,WAAkB,QAAQ,
|
|
1
|
+
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/common/Logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/C,MAAM,CAAC,OAAO,OAAO,MAAO,YAAW,WAAW;IAE9C,OAAc,UAAU,SAAgB;IAExC,WAAkB,QAAQ,kBAEzB;IACD,OAAO,CAAC,MAAM,CAAC,cAAc,CAAgB;IAE7C,GAAG,CAAC,CAAC,KAAA;IAKL,KAAK,CAAC,CAAC,KAAA;IAKP,UAAU;IAIV,OAAO;CAGV;AAED,qBAAa,aAAc,SAAQ,MAAM;IAErC,GAAG,CAAC,CAAC,KAAA;IAKL,KAAK,CAAC,CAAC,KAAA;IAKP,UAAU;IAIV,OAAO;CAGV;AAED,cAAM,aAAc,SAAQ,MAAM;IAGlB,OAAO,CAAC,MAAM;IAF1B,OAAO,CAAC,KAAK,CAAM;gBAEC,MAAM,EAAE,MAAM;IAIlC,GAAG,CAAC,CAAC,KAAA;IAKL,KAAK,CAAC,CAAC,EAAE,GAAG;IAKZ,OAAO,IAAI,IAAI;CAalB"}
|
package/dist/common/Logger.js
CHANGED
|
@@ -9,8 +9,9 @@ import { RegisterSingleton } from "../di/di.js";
|
|
|
9
9
|
/* eslint-disable no-console */
|
|
10
10
|
let Logger = class Logger {
|
|
11
11
|
static { Logger_1 = this; }
|
|
12
|
+
static nullLogger = new Logger_1();
|
|
12
13
|
static get instance() {
|
|
13
|
-
return this.globalInstance ??= new
|
|
14
|
+
return this.globalInstance ??= new ConsoleLogger();
|
|
14
15
|
}
|
|
15
16
|
static globalInstance;
|
|
16
17
|
log(a) {
|
|
@@ -32,6 +33,22 @@ Logger = Logger_1 = __decorate([
|
|
|
32
33
|
RegisterSingleton
|
|
33
34
|
], Logger);
|
|
34
35
|
export default Logger;
|
|
36
|
+
export class ConsoleLogger extends Logger {
|
|
37
|
+
log(a) {
|
|
38
|
+
console.log(a);
|
|
39
|
+
return this;
|
|
40
|
+
}
|
|
41
|
+
error(a) {
|
|
42
|
+
console.error(a);
|
|
43
|
+
return this;
|
|
44
|
+
}
|
|
45
|
+
newSession() {
|
|
46
|
+
return new SessionLogger(this);
|
|
47
|
+
}
|
|
48
|
+
dispose() {
|
|
49
|
+
// do nothing...
|
|
50
|
+
}
|
|
51
|
+
}
|
|
35
52
|
class SessionLogger extends Logger {
|
|
36
53
|
parent;
|
|
37
54
|
items = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/common/Logger.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,+BAA+B;AAEhB,IAAM,MAAM,GAAZ,MAAM,MAAM;;IAEhB,MAAM,KAAK,QAAQ;QACtB,OAAO,IAAI,CAAC,cAAc,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/common/Logger.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,+BAA+B;AAEhB,IAAM,MAAM,GAAZ,MAAM,MAAM;;IAEhB,MAAM,CAAC,UAAU,GAAG,IAAI,QAAM,EAAE,CAAC;IAEjC,MAAM,KAAK,QAAQ;QACtB,OAAO,IAAI,CAAC,cAAc,KAAK,IAAI,aAAa,EAAE,CAAC;IACvD,CAAC;IACO,MAAM,CAAC,cAAc,CAAgB;IAE7C,GAAG,CAAC,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,CAAC;QACH,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU;QACN,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,OAAO;QACH,gBAAgB;IACpB,CAAC;;AAzBgB,MAAM;IAD1B,iBAAiB;GACG,MAAM,CA0B1B;eA1BoB,MAAM;AA4B3B,MAAM,OAAO,aAAc,SAAQ,MAAM;IAErC,GAAG,CAAC,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,CAAC;QACH,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU;QACN,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,OAAO;QACH,gBAAgB;IACpB,CAAC;CACJ;AAED,MAAM,aAAc,SAAQ,MAAM;IAGV;IAFZ,KAAK,GAAG,EAAE,CAAC;IAEnB,YAAoB,MAAc;QAC9B,KAAK,EAAE,CAAC;QADQ,WAAM,GAAN,MAAM,CAAQ;IAElC,CAAC;IAED,GAAG,CAAC,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,EAAC,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,CAAM;QACR,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,KAAK,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE;YACrC,IAAI,GAAG,EAAE;gBACL,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrB,SAAS;aACZ;YACD,IAAI,KAAK,EAAE;gBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzB,SAAS;aACZ;SACJ;IACL,CAAC;CAEJ"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
interface IObjectPool<T> {
|
|
2
|
+
factory?: () => T;
|
|
3
|
+
asyncFactory?: () => Promise<T>;
|
|
4
|
+
destroy: (item: T) => any;
|
|
5
|
+
subscribeForRemoval: (po: IPooledObject<T>, clear: () => void) => void;
|
|
6
|
+
/**
|
|
7
|
+
* Max Number of Pooled objects, default is 20
|
|
8
|
+
*/
|
|
9
|
+
size?: number;
|
|
10
|
+
/**
|
|
11
|
+
* Default is 50
|
|
12
|
+
*/
|
|
13
|
+
max?: number;
|
|
14
|
+
/**
|
|
15
|
+
* Max wait in milliseconds before creating
|
|
16
|
+
* new object, default is 15 seconds with gap of 1 second each
|
|
17
|
+
*/
|
|
18
|
+
maxWait?: number;
|
|
19
|
+
}
|
|
20
|
+
export type IPooledObject<T> = T & {
|
|
21
|
+
[Symbol.asyncDisposable](): Promise<any>;
|
|
22
|
+
};
|
|
23
|
+
/**
|
|
24
|
+
* Most pool implementations are poor and are having too many errors.
|
|
25
|
+
*/
|
|
26
|
+
export default class ObjectPool<T> {
|
|
27
|
+
private factory;
|
|
28
|
+
private asyncFactory;
|
|
29
|
+
private destroy;
|
|
30
|
+
private subscribeForRemoval;
|
|
31
|
+
private size;
|
|
32
|
+
private max;
|
|
33
|
+
private maxWait;
|
|
34
|
+
private free;
|
|
35
|
+
private total;
|
|
36
|
+
private awaited;
|
|
37
|
+
constructor(p: IObjectPool<T>);
|
|
38
|
+
dispose(): Promise<void>;
|
|
39
|
+
acquire(): Promise<IPooledObject<T>>;
|
|
40
|
+
}
|
|
41
|
+
export {};
|
|
42
|
+
//# sourceMappingURL=ObjectPool.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ObjectPool.d.ts","sourceRoot":"","sources":["../../src/common/ObjectPool.ts"],"names":[],"mappings":"AAIA,UAAU,WAAW,CAAC,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC;IAE1B,mBAAmB,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAEvE;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;CAAE,CAAC;AAEjF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,CAAC;IAE7B,OAAO,CAAC,OAAO,CAAU;IAEzB,OAAO,CAAC,YAAY,CAAmB;IAEvC,OAAO,CAAC,OAAO,CAAmB;IAElC,OAAO,CAAC,mBAAmB,CAAqD;IAEhF,OAAO,CAAC,IAAI,CAAS;IAErB,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,IAAI,CAAW;IAEvB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,OAAO,CAAuB;gBAE1B,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;IAYhB,OAAO;IAYP,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;CA4CpD"}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
/* eslint-disable no-console */
|
|
2
|
+
import EntityAccessError from "./EntityAccessError.js";
|
|
3
|
+
import sleep from "./sleep.js";
|
|
4
|
+
/**
|
|
5
|
+
* Most pool implementations are poor and are having too many errors.
|
|
6
|
+
*/
|
|
7
|
+
export default class ObjectPool {
|
|
8
|
+
factory;
|
|
9
|
+
asyncFactory;
|
|
10
|
+
destroy;
|
|
11
|
+
subscribeForRemoval;
|
|
12
|
+
size;
|
|
13
|
+
max;
|
|
14
|
+
maxWait;
|
|
15
|
+
free = [];
|
|
16
|
+
total;
|
|
17
|
+
awaited;
|
|
18
|
+
constructor(p) {
|
|
19
|
+
Object.setPrototypeOf(p, ObjectPool.prototype);
|
|
20
|
+
p.max ||= 20;
|
|
21
|
+
p.maxWait ||= 15000;
|
|
22
|
+
p.size ||= 50;
|
|
23
|
+
const r = p;
|
|
24
|
+
r.total = 0;
|
|
25
|
+
r.awaited = new Set();
|
|
26
|
+
r.free = [];
|
|
27
|
+
return p;
|
|
28
|
+
}
|
|
29
|
+
async dispose() {
|
|
30
|
+
const copy = [].concat(this.free);
|
|
31
|
+
this.free = [];
|
|
32
|
+
for (const iterator of this.awaited) {
|
|
33
|
+
iterator.abort();
|
|
34
|
+
}
|
|
35
|
+
this.awaited.clear();
|
|
36
|
+
for (const iterator of copy) {
|
|
37
|
+
await this.destroy(iterator);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
async acquire() {
|
|
41
|
+
let item = this.free.pop();
|
|
42
|
+
if (!item) {
|
|
43
|
+
if (this.total > this.size) {
|
|
44
|
+
const a = new AbortController();
|
|
45
|
+
this.awaited.add(a);
|
|
46
|
+
await sleep(this.maxWait, a.signal);
|
|
47
|
+
this.awaited.delete(a);
|
|
48
|
+
item = this.free.pop();
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
if (!item) {
|
|
52
|
+
// create new..
|
|
53
|
+
if (this.factory) {
|
|
54
|
+
item = this.factory();
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
item = await this.asyncFactory();
|
|
58
|
+
}
|
|
59
|
+
this.subscribeForRemoval(item, () => {
|
|
60
|
+
const index = this.free.indexOf(item);
|
|
61
|
+
this.free.splice(index, 1);
|
|
62
|
+
});
|
|
63
|
+
if (this.total >= this.max) {
|
|
64
|
+
throw new EntityAccessError(`Maximum size of pool reached.`);
|
|
65
|
+
}
|
|
66
|
+
this.total++;
|
|
67
|
+
}
|
|
68
|
+
const pooledItem = item;
|
|
69
|
+
pooledItem[Symbol.asyncDisposable] = async () => {
|
|
70
|
+
if (this.free.length < this.max) {
|
|
71
|
+
this.free.push(item);
|
|
72
|
+
for (const iterator of this.awaited) {
|
|
73
|
+
this.awaited.delete(iterator);
|
|
74
|
+
iterator.abort();
|
|
75
|
+
break;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
await this.destroy(item);
|
|
80
|
+
this.total--;
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
return item;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=ObjectPool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ObjectPool.js","sourceRoot":"","sources":["../../src/common/ObjectPool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../../src/common/sleep.ts"],"names":[],"mappings":";AAAA,wBAA8B,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,YAAY,UAAQ,iBAexF"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export default async function sleep(n, signal, throwOnAbort = false) {
|
|
2
|
+
if (signal?.aborted) {
|
|
3
|
+
return;
|
|
4
|
+
}
|
|
5
|
+
return new Promise((resolve, reject) => {
|
|
6
|
+
const id = setTimeout(resolve, n);
|
|
7
|
+
signal?.addEventListener("abort", () => {
|
|
8
|
+
clearTimeout(id);
|
|
9
|
+
if (throwOnAbort) {
|
|
10
|
+
reject("cancelled");
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
resolve();
|
|
14
|
+
});
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=sleep.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../../src/common/sleep.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,KAAK,CAAC,CAAS,EAAE,MAAoB,EAAE,YAAY,GAAG,KAAK;IACrF,IAAI,MAAM,EAAE,OAAO,EAAE;QACjB,OAAO;KACV;IACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACzC,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAClC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YACnC,YAAY,CAAC,EAAE,CAAC,CAAC;YACjB,IAAI,YAAY,EAAE;gBACd,MAAM,CAAC,WAAW,CAAC,CAAC;gBACpB,OAAO;aACV;YACD,OAAO,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../src/decorators/Column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAG5C,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,OAAO,kBAAkB,CAAC;AAE1B,CAAC;AACD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAA2C,EAAE;IACxE,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACnB,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;QACxC,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,CAAC,GAAG,KAAK,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,CAAC;QAC9C,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;YACjB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE;gBAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;aAClB;SACJ;QACD,CAAC,CAAC,UAAU,KAAK,GAAG,CAAC;QACrB,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;QACb,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC;QACrB,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC,CAAC,IAAI,GAAI,OAAe,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC,EAAE;YACvB,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;SACpC;QAGD,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,QAAQ,CAAC,CAAU,EAAE,MAAW;IACrC,QAAO,MAAM,EAAE;QACX,KAAK,MAAM;YACP,OAAO,MAAM,CAAC;QAClB,KAAK,MAAM;YACP,IAAI,CAAC,CAAC,GAAG,EAAE;gBACP,OAAO,QAAQ,CAAC;aACnB;YACD,OAAO,QAAQ,CAAC;QACpB,KAAK,MAAM;YACP,OAAO,QAAQ,CAAC;QACpB,KAAK,IAAI,CAAC;QACV,KAAK,QAAQ;YACT,OAAO,
|
|
1
|
+
{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../src/decorators/Column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAG5C,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,OAAO,kBAAkB,CAAC;AAE1B,CAAC;AACD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAA2C,EAAE;IACxE,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACnB,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;QACxC,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,CAAC,GAAG,KAAK,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,CAAC;QAC9C,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;YACjB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE;gBAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;aAClB;SACJ;QACD,CAAC,CAAC,UAAU,KAAK,GAAG,CAAC;QACrB,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;QACb,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC;QACrB,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC,CAAC,IAAI,GAAI,OAAe,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC,EAAE;YACvB,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;SACpC;QAGD,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,QAAQ,CAAC,CAAU,EAAE,MAAW;IACrC,QAAO,MAAM,EAAE;QACX,KAAK,MAAM;YACP,OAAO,MAAM,CAAC;QAClB,KAAK,MAAM;YACP,IAAI,CAAC,CAAC,GAAG,EAAE;gBACP,OAAO,QAAQ,CAAC;aACnB;YACD,OAAO,QAAQ,CAAC;QACpB,KAAK,MAAM;YACP,OAAO,QAAQ,CAAC;QACpB,KAAK,IAAI,CAAC;QACV,KAAK,QAAQ;YACT,OAAO,gBAAgB,CAAC;QAC5B,KAAK,OAAO;YACR,OAAO,SAAS,CAAC;KACxB;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
package/dist/di/di.d.ts
CHANGED
|
@@ -6,10 +6,10 @@ export declare const injectServiceTypesSymbol: unique symbol;
|
|
|
6
6
|
export declare const injectServiceKeysSymbol: unique symbol;
|
|
7
7
|
declare const registrationsSymbol: unique symbol;
|
|
8
8
|
export declare class ServiceProvider implements IDisposable {
|
|
9
|
-
static
|
|
9
|
+
static from(owner: any): ServiceProvider;
|
|
10
10
|
static resolve<T>(serviceOwner: any, type: IClassOf<T>): T;
|
|
11
11
|
static create<T>(serviceOwner: any, type: IClassOf<T>): T;
|
|
12
|
-
|
|
12
|
+
static createScope<T>(serviceOwner: any): ServiceProvider;
|
|
13
13
|
private map;
|
|
14
14
|
private disposables;
|
|
15
15
|
constructor(parent?: ServiceProvider);
|
package/dist/di/di.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.d.ts","sourceRoot":"","sources":["../../src/di/di.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,kBAAkB,CAAC;AAE1B,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,CAAC;AAI/D,eAAO,MAAM,wBAAwB,eAA+B,CAAC;AACrE,eAAO,MAAM,uBAAuB,eAA8B,CAAC;AAEnE,QAAA,MAAM,mBAAmB,eAA0B,CAAC;AAMpD,qBAAa,eAAgB,YAAW,WAAW;
|
|
1
|
+
{"version":3,"file":"di.d.ts","sourceRoot":"","sources":["../../src/di/di.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,kBAAkB,CAAC;AAE1B,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,CAAC;AAI/D,eAAO,MAAM,wBAAwB,eAA+B,CAAC;AACrE,eAAO,MAAM,uBAAuB,eAA8B,CAAC;AAEnE,QAAA,MAAM,mBAAmB,eAA0B,CAAC;AAMpD,qBAAa,eAAgB,YAAW,WAAW;WAEjC,IAAI,CAAC,KAAK,EAAE,GAAG;WAIf,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAKjE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,KAAA,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAKpD,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,YAAY,KAAA,GAAG,eAAe;IAKpD,OAAO,CAAC,GAAG,CAA2B;IACtC,OAAO,CAAC,WAAW,CAAgB;gBAEvB,MAAM,CAAC,EAAE,eAAe;IAMpC,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;IAU5E,WAAW;IAIX,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAK/B,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAwChC,OAAO;IAIP,CAAC,MAAM,CAAC,UAAU,CAAC;IAUnB,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,cAAc;CAazB;AAED,MAAM,WAAW,kBAAkB;IAE/B,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,GAAG,CAAC;CAC1C;AAGD,eAAO,MAAM,iBAAiB;mBACX,WAAW,2BAAsB,eAAe,KAAK,GAAG;;CAI1E,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAAM,KAAA,EAAE,GAAG,KAAA,EAAE,KAAK,CAAC,EAAE,MAAM,QAsCzD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,GAAG,yBAIjF;AAED,eAAO,MAAM,iBAAiB,uBAAwB,CAAC;AAEvD,eAAO,MAAM,cAAc,uBAAqB,CAAC;AAEjD,eAAO,MAAM,iBAAiB,uBAAwB,CAAC"}
|
package/dist/di/di.js
CHANGED
|
@@ -5,30 +5,35 @@ export const injectServiceTypesSymbol = Symbol("injectServiceTypes");
|
|
|
5
5
|
export const injectServiceKeysSymbol = Symbol("injectServiceKeys");
|
|
6
6
|
const registrationsSymbol = Symbol("registrations");
|
|
7
7
|
const serviceProvider = Symbol("serviceProvider");
|
|
8
|
-
const
|
|
8
|
+
const globalServiceProvider = Symbol("globalInstance");
|
|
9
9
|
export class ServiceProvider {
|
|
10
|
-
static
|
|
11
|
-
return
|
|
10
|
+
static from(owner) {
|
|
11
|
+
return (owner[serviceProvider]);
|
|
12
12
|
}
|
|
13
13
|
static resolve(serviceOwner, type) {
|
|
14
|
-
const sp =
|
|
14
|
+
const sp = serviceOwner[serviceProvider];
|
|
15
15
|
return sp.resolve(type);
|
|
16
16
|
}
|
|
17
17
|
static create(serviceOwner, type) {
|
|
18
|
-
const sp =
|
|
18
|
+
const sp = serviceOwner[serviceProvider];
|
|
19
19
|
return sp.createFromType(type);
|
|
20
20
|
}
|
|
21
|
-
static
|
|
21
|
+
static createScope(serviceOwner) {
|
|
22
|
+
const sp = serviceOwner[globalServiceProvider];
|
|
23
|
+
return sp.createScope();
|
|
24
|
+
}
|
|
22
25
|
map = new Map();
|
|
23
26
|
disposables;
|
|
24
27
|
constructor(parent) {
|
|
25
28
|
this[serviceProvider] = this;
|
|
26
|
-
this[
|
|
29
|
+
this[globalServiceProvider] = parent?.[globalServiceProvider] ?? this;
|
|
30
|
+
this.map.set(ServiceProvider, this);
|
|
27
31
|
}
|
|
28
32
|
add(type, instance) {
|
|
29
33
|
this.getRegistration(type, true);
|
|
30
34
|
this.map.set(type, instance);
|
|
31
35
|
instance[serviceProvider] = this;
|
|
36
|
+
instance[globalServiceProvider] = this[globalServiceProvider];
|
|
32
37
|
this.resolveProperties(instance);
|
|
33
38
|
return instance;
|
|
34
39
|
}
|
|
@@ -43,7 +48,7 @@ export class ServiceProvider {
|
|
|
43
48
|
const sd = this.getRegistration(type);
|
|
44
49
|
switch (sd.kind) {
|
|
45
50
|
case "Scoped":
|
|
46
|
-
if (
|
|
51
|
+
if (this[globalServiceProvider] === this) {
|
|
47
52
|
throw new Error(`Unable to create scoped service ${type?.name ?? type} in global scope.`);
|
|
48
53
|
}
|
|
49
54
|
instance = this.map.get(type);
|
|
@@ -51,20 +56,19 @@ export class ServiceProvider {
|
|
|
51
56
|
instance = this.createFromDescriptor(sd);
|
|
52
57
|
this.map.set(type, instance);
|
|
53
58
|
instance[serviceProvider] = this;
|
|
59
|
+
instance[globalServiceProvider] = this[globalServiceProvider];
|
|
54
60
|
if (instance[Symbol.disposable] || instance[Symbol.asyncDisposable]) {
|
|
55
61
|
(this.disposables ??= []).push(instance);
|
|
56
62
|
}
|
|
57
63
|
}
|
|
58
64
|
return instance;
|
|
59
65
|
case "Singleton":
|
|
60
|
-
|
|
61
|
-
while (sp[parentServiceProvider]) {
|
|
62
|
-
sp = sp[parentServiceProvider];
|
|
63
|
-
}
|
|
66
|
+
const sp = this[globalServiceProvider];
|
|
64
67
|
instance = sp.map.get(type);
|
|
65
68
|
if (!instance) {
|
|
66
69
|
instance = sp.createFromDescriptor(sd);
|
|
67
|
-
instance[serviceProvider] =
|
|
70
|
+
instance[serviceProvider] = this;
|
|
71
|
+
instance[globalServiceProvider] = sp;
|
|
68
72
|
sp.map.set(type, instance);
|
|
69
73
|
if (instance[Symbol.disposable] || instance[Symbol.asyncDisposable]) {
|
|
70
74
|
(sp.disposables ??= []).push(instance);
|
|
@@ -73,7 +77,8 @@ export class ServiceProvider {
|
|
|
73
77
|
return instance;
|
|
74
78
|
case "Transient":
|
|
75
79
|
instance = sp.createFromDescriptor(sd);
|
|
76
|
-
instance[serviceProvider] =
|
|
80
|
+
instance[serviceProvider] = this;
|
|
81
|
+
instance[globalServiceProvider] = sp;
|
|
77
82
|
return instance;
|
|
78
83
|
}
|
|
79
84
|
}
|
|
@@ -93,7 +98,7 @@ export class ServiceProvider {
|
|
|
93
98
|
let sd = registrations.get(type);
|
|
94
99
|
if (!sd) {
|
|
95
100
|
if (add) {
|
|
96
|
-
const registration = { key: type, kind: this[
|
|
101
|
+
const registration = { key: type, kind: this[globalServiceProvider] !== this ? "Scoped" : "Singleton" };
|
|
97
102
|
registrations.set(type, registration);
|
|
98
103
|
return registration;
|
|
99
104
|
}
|
|
@@ -125,7 +130,7 @@ export class ServiceProvider {
|
|
|
125
130
|
for (const key in keys) {
|
|
126
131
|
if (Object.prototype.hasOwnProperty.call(keys, key)) {
|
|
127
132
|
const element = keys[key];
|
|
128
|
-
instance[key]
|
|
133
|
+
instance[key] ??= this.resolve(element);
|
|
129
134
|
}
|
|
130
135
|
}
|
|
131
136
|
}
|
|
@@ -137,6 +142,7 @@ export class ServiceProvider {
|
|
|
137
142
|
: [];
|
|
138
143
|
const instance = new type(...injectServices);
|
|
139
144
|
instance[serviceProvider] = this;
|
|
145
|
+
instance[globalServiceProvider] = this[globalServiceProvider];
|
|
140
146
|
// initialize properties...
|
|
141
147
|
this.resolveProperties(instance, type);
|
|
142
148
|
return instance;
|
|
@@ -150,9 +156,17 @@ export const ServiceCollection = {
|
|
|
150
156
|
};
|
|
151
157
|
export default function Inject(target, key, index) {
|
|
152
158
|
if (index !== void 0) {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
159
|
+
if (key) {
|
|
160
|
+
// this is parameter inside a method...
|
|
161
|
+
const plist = Reflect.getMetadata("design:paramtypes", target, key);
|
|
162
|
+
const pTypes = (target[injectServiceKeysSymbol] ??= {})[key] = [];
|
|
163
|
+
pTypes[index] = plist[index];
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
const plist = Reflect.getMetadata("design:paramtypes", target, key);
|
|
167
|
+
const serviceTypes = target[injectServiceTypesSymbol] ??= [];
|
|
168
|
+
serviceTypes[index] = plist[index];
|
|
169
|
+
}
|
|
156
170
|
return;
|
|
157
171
|
}
|
|
158
172
|
const pType = Reflect.getMetadata("design:type", target, key);
|
package/dist/di/di.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.js","sourceRoot":"","sources":["../../src/di/di.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG1E,OAAO,kBAAkB,CAAC;AAI1B,MAAM,aAAa,GAAG,IAAI,GAAG,EAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AACrE,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAEnE,MAAM,mBAAmB,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAEpD,MAAM,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAElD,MAAM,qBAAqB,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"di.js","sourceRoot":"","sources":["../../src/di/di.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDriver.d.ts","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"BaseDriver.d.ts","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":";;AACA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,WAAW,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAA8B,eAAe,EAAgC,eAAe,EAA4F,eAAe,EAAmB,MAAM,gCAAgC,CAAC;AAExQ,eAAO,MAAM,gBAAgB,EAAE,OAAO,MAAyD,CAAC;AAEhG,UAAU,WAAW;IACjB,CAAC,gBAAgB,CAAC,CAAC,IAAI,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,OAAO;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,SAAU,SAAQ,WAAW;IAC1C,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5E,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,OAAO,SAAU,MAAM;UAAW,MAAM;aAAW,GAAG,EAAE;CAE3D,CAAC;AAEX,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,8BAAsB,UAAU;aAGA,gBAAgB,EAAE,mBAAmB;IAFjE,QAAQ,KAAK,QAAQ,IAAI,aAAa,CAAC;gBAEX,gBAAgB,EAAE,mBAAmB;aAEjD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC;aAExE,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;aAE1E,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;aAE9B,gBAAgB,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAE5E;;;OAGG;aACa,mBAAmB,IAAI,UAAU;IAEjD,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,eAAe;IAkCtE,sBAAsB,CAAC,KAAK,EAAE,WAAW;IA+BzC,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG;CA0BvD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import QueryCompiler from "../../compiler/QueryCompiler.js";
|
|
3
3
|
import Migrations from "../../migrations/Migrations.js";
|
|
4
4
|
import { BaseDriver, IDbConnectionString, IDbReader, IQuery } from "../base/BaseDriver.js";
|
|
5
|
-
import
|
|
5
|
+
import pg from "pg";
|
|
6
6
|
export interface IPgSqlConnectionString extends IDbConnectionString {
|
|
7
7
|
user?: string;
|
|
8
8
|
password?: string;
|
|
@@ -27,7 +27,7 @@ export default class PostgreSqlDriver extends BaseDriver {
|
|
|
27
27
|
runInTransaction<T>(fx?: () => Promise<T>): Promise<T>;
|
|
28
28
|
automaticMigrations(): Migrations;
|
|
29
29
|
executeReader(command: IQuery, signal?: AbortSignal): Promise<IDbReader>;
|
|
30
|
-
executeQuery(command: IQuery, signal?: AbortSignal): Promise<
|
|
30
|
+
executeQuery(command: IQuery, signal?: AbortSignal): Promise<pg.QueryResult<any>>;
|
|
31
31
|
ensureDatabase(): Promise<void>;
|
|
32
32
|
private getConnection;
|
|
33
33
|
private kill;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgreSqlDriver.d.ts","sourceRoot":"","sources":["../../../src/drivers/postgres/PostgreSqlDriver.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"PostgreSqlDriver.d.ts","sourceRoot":"","sources":["../../../src/drivers/postgres/PostgreSqlDriver.ts"],"names":[],"mappings":";AAIA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,UAAU,MAAM,gCAAgC,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,EAAoB,MAAM,uBAAuB,CAAC;AAC7G,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IAE/D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mCAAmC,CAAC,EAAE,MAAM,CAAA;CAC/C;AAqCD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU;IASxC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAPnC,IAAW,QAAQ,kBAElB;IAED,OAAO,CAAC,WAAW,CAA2B;IAC9C,OAAO,CAAC,UAAU,CAAuB;gBAEZ,MAAM,EAAE,sBAAsB;IAI9C,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqB5D,mBAAmB,IAAI,UAAU;IAI3B,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC;IAOxE,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAcxD,cAAc;YAkCP,aAAa;YAsCb,IAAI;CAWrB"}
|