@decaf-ts/core 0.11.0 → 0.12.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/README.md +1 -1
- package/dist/core.cjs +1 -1
- package/dist/core.cjs.map +1 -1
- package/dist/core.js +1 -1
- package/dist/core.js.map +1 -1
- package/lib/esm/index.d.ts +1 -1
- package/lib/esm/index.js +1 -1
- package/lib/esm/persistence/Dispatch.d.ts +1 -0
- package/lib/esm/persistence/Dispatch.js +17 -3
- package/lib/esm/persistence/Dispatch.js.map +1 -1
- package/lib/esm/query/decorators.js +8 -3
- package/lib/esm/query/decorators.js.map +1 -1
- package/lib/index.cjs +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/persistence/Dispatch.cjs +17 -3
- package/lib/persistence/Dispatch.d.ts +1 -0
- package/lib/persistence/Dispatch.js.map +1 -1
- package/lib/query/decorators.cjs +8 -3
- package/lib/query/decorators.js.map +1 -1
- package/package.json +1 -1
package/lib/esm/index.d.ts
CHANGED
|
@@ -22,7 +22,7 @@ export * from "./persistence";
|
|
|
22
22
|
* @const VERSION
|
|
23
23
|
* @memberOf module:core
|
|
24
24
|
*/
|
|
25
|
-
export declare const VERSION = "0.
|
|
25
|
+
export declare const VERSION = "0.12.1";
|
|
26
26
|
/**
|
|
27
27
|
* @description Stores the current package version
|
|
28
28
|
* @summary A constant representing the version of the core package
|
package/lib/esm/index.js
CHANGED
|
@@ -32,7 +32,7 @@ export * from "./persistence/index.js";
|
|
|
32
32
|
* @const VERSION
|
|
33
33
|
* @memberOf module:core
|
|
34
34
|
*/
|
|
35
|
-
export const VERSION = "0.
|
|
35
|
+
export const VERSION = "0.12.1";
|
|
36
36
|
/**
|
|
37
37
|
* @description Stores the current package version
|
|
38
38
|
* @summary A constant representing the version of the core package
|
|
@@ -32,6 +32,7 @@ import { ContextualArgs, ContextualizedArgs, ContextualLoggedClass, MaybeContext
|
|
|
32
32
|
* ```
|
|
33
33
|
*/
|
|
34
34
|
export declare class Dispatch<A extends Adapter<any, any, any, any>> extends ContextualLoggedClass<ContextOf<A>> implements AdapterDispatch<A> {
|
|
35
|
+
private isSameObservedAdapter;
|
|
35
36
|
/**
|
|
36
37
|
* Indicates whether the dispatcher has already been initialized.
|
|
37
38
|
*
|
|
@@ -31,6 +31,17 @@ import { PersistenceKeys } from "./constants.js";
|
|
|
31
31
|
* ```
|
|
32
32
|
*/
|
|
33
33
|
export class Dispatch extends ContextualLoggedClass {
|
|
34
|
+
isSameObservedAdapter(observer) {
|
|
35
|
+
if (!this.adapter)
|
|
36
|
+
return false;
|
|
37
|
+
if (this.adapter === observer)
|
|
38
|
+
return true;
|
|
39
|
+
const current = this.adapter;
|
|
40
|
+
const candidate = observer;
|
|
41
|
+
if (!(candidate instanceof Adapter))
|
|
42
|
+
return false;
|
|
43
|
+
return (current.alias === candidate.alias && current.flavour === candidate.flavour);
|
|
44
|
+
}
|
|
34
45
|
/**
|
|
35
46
|
* @description Creates a new Dispatch instance
|
|
36
47
|
* @summary Initializes a new Dispatch instance without any adapter
|
|
@@ -183,8 +194,11 @@ export class Dispatch extends ContextualLoggedClass {
|
|
|
183
194
|
observe(observer) {
|
|
184
195
|
if (!(observer instanceof Adapter))
|
|
185
196
|
throw new UnsupportedError("Only Adapters can be observed by dispatch");
|
|
186
|
-
if (this.adapter)
|
|
187
|
-
|
|
197
|
+
if (this.adapter) {
|
|
198
|
+
if (this.isSameObservedAdapter(observer))
|
|
199
|
+
return () => this.unObserve(observer);
|
|
200
|
+
throw new UnsupportedError("Dispatch is already observing another adapter");
|
|
201
|
+
}
|
|
188
202
|
this.adapter = observer;
|
|
189
203
|
this.models = Adapter.models(this.adapter.alias);
|
|
190
204
|
this.initialize().then(() => this.log.verbose(`Dispatch initialized for ${this.adapter.alias} adapter`));
|
|
@@ -197,7 +211,7 @@ export class Dispatch extends ContextualLoggedClass {
|
|
|
197
211
|
* @return {void}
|
|
198
212
|
*/
|
|
199
213
|
unObserve(observer) {
|
|
200
|
-
if (this.
|
|
214
|
+
if (!this.isSameObservedAdapter(observer))
|
|
201
215
|
throw new UnsupportedError("Only the adapter that was used to observe can be unobserved");
|
|
202
216
|
this.adapter = undefined;
|
|
203
217
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dispatch.js","sourceRoot":"","sources":["../../../src/persistence/Dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAoB,MAAM,gCAAgC,CAAC;AAEzE,OAAO,EAAE,OAAO,EAAE,qBAAkB;AACpC,OAAO,EAAE,gBAAgB,EAAE,oBAAiB;AAG5C,OAAO,EAGL,qBAAqB,GAGtB,4CAAuC;AACxC,OAAO,EAAE,eAAe,EAAE,uBAAoB;AAE9C;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,OAAO,QACX,SAAQ,qBAAmC;
|
|
1
|
+
{"version":3,"file":"Dispatch.js","sourceRoot":"","sources":["../../../src/persistence/Dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAoB,MAAM,gCAAgC,CAAC;AAEzE,OAAO,EAAE,OAAO,EAAE,qBAAkB;AACpC,OAAO,EAAE,gBAAgB,EAAE,oBAAiB;AAG5C,OAAO,EAGL,qBAAqB,GAGtB,4CAAuC;AACxC,OAAO,EAAE,eAAe,EAAE,uBAAoB;AAE9C;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,OAAO,QACX,SAAQ,qBAAmC;IAGnC,qBAAqB,CAAC,QAAkB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAChC,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAiD,CAAC;QACvE,MAAM,SAAS,GAAG,QAAkD,CAAC;QACrE,IAAI,CAAC,CAAC,SAAS,YAAY,OAAO,CAAC;YAAE,OAAO,KAAK,CAAC;QAElD,OAAO,CACL,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,OAAO,CAC3E,CAAC;IACJ,CAAC;IAsBD;;;OAGG;IACH;QACE,KAAK,EAAE,CAAC;QAzBV;;;;;WAKG;QACO,gBAAW,GAAY,KAAK,CAAC;IAoBvC,CAAC;IAmCkB,MAAM,CAIvB,IAA4C,EAC5C,SAAiB,EACjB,cAAuB,KAAK;QAc5B,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,aAAa,CAAC,qBAAqB,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,WAAkB,CAY5D,CAAC;IACR,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmCG;IACO,KAAK,CAAC,UAAU,CACxB,GAAG,IAAsC;QAEzC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,kEAAkE;YAClE,0EAA0E;YAC1E,qEAAqE;YACrE,IAAI,CAAC,GAAG;iBACL,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC;iBACpB,OAAO,CAAC,2DAA2D,CAAC,CAAC;YACxE,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG;iBACL,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC;iBACpB,KAAK,CACJ,oFAAoF,CACrF,CAAC;YACJ,OAAO;QACT,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,GAAG,CACd,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,cAAc,EAAE,IAAI,CAAC,CAC9D,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvB,GAAG,CAAC,OAAO,CAAC,gBAAgB,IAAI,CAAC,OAAO,mBAAmB,CAAC,CAAC;QAC7D,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAExB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAsC,CAAC;QAE1D;YACE,aAAa,CAAC,MAAM;YACpB,aAAa,CAAC,MAAM;YACpB,aAAa,CAAC,MAAM;YACpB,qBAAqB,CAAC,UAAU;YAChC,qBAAqB,CAAC,UAAU;YAChC,qBAAqB,CAAC,UAAU;SAEnC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;gBAClB,MAAM,IAAI,aAAa,CACrB,UAAU,MAAM,iBAAiB,OAAO,CAAC,KAAK,uCAAuC,CACtF,CAAC;YAEJ,IAAI,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAClE,IAAI,KAAK,GAAQ,OAAO,CAAC;YACzB,OAAO,CAAC,UAAU,IAAI,KAAK,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC;gBACjD,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBACrC,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC9D,CAAC;YAED,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,yBAAyB,MAAM,+BAA+B,CAC/D,CAAC;gBACF,OAAO;YACT,CAAC;YACD,SAAS,YAAY,CAAC,MAAc;gBAClC,QAAQ,MAAM,EAAE,CAAC;oBACf,KAAK,qBAAqB,CAAC,UAAU;wBACnC,OAAO,aAAa,CAAC,MAAM,CAAC;oBAC9B,KAAK,qBAAqB,CAAC,UAAU;wBACnC,OAAO,aAAa,CAAC,MAAM,CAAC;oBAC9B,KAAK,qBAAqB,CAAC,UAAU;wBACnC,OAAO,aAAa,CAAC,MAAM,CAAC;oBAC9B;wBACE,OAAO,MAAM,CAAC;gBAClB,CAAC;YACH,CAAC;YAED,0DAA0D;YAC1D,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC3C,KAAK,EAAE,KAAK,EAAE,MAAW,EAAE,OAAU,EAAE,QAAe,EAAE,EAAE;oBACxD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAC7C,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC1D,MAAM,CACP,CAAC;oBACF,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC;oBAC3C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;wBACzC,SAAS;wBACT,GAAG;wBACH,OAAO;wBACP,GAAG,OAAO;qBACX,CAAC,CAAC;oBAEH,MAAM,UAAU,GAA+B;wBAC7C,SAAS;wBACT,YAAY,CAAC,MAAM,CAAC;wBACpB,GAAG;qBACJ,CAAC;oBAEF,IAAI,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;wBACjC,UAAU,CAAC,IAAI,CACb,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;4BACnB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;4BACjC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CACtB,CAAC;oBACJ,CAAC;oBACD,IAAI,CAAC,eAAe,CAAC,GAAG,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CACnE,GAAG,CAAC,KAAK,CACP,2CAA2C,MAAM,OAAO,SAAS,CAAC,IAAI,IAAI,SAAS,QAAQ,GAAG,KAAK,CAAC,EAAE,CACvG,CACF,CAAC;oBACF,OAAO,MAAM,CAAC;gBAChB,CAAC;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,6DAA6D;IAC7D,KAAK,CAAC,KAAK,CAAC,GAAG,OAAqC;QAClD,0EAA0E;IAC5E,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,QAAW;QACjB,IAAI,CAAC,CAAC,QAAQ,YAAY,OAAO,CAAC;YAChC,MAAM,IAAI,gBAAgB,CAAC,2CAA2C,CAAC,CAAC;QAE1E,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;gBACtC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,IAAI,gBAAgB,CACxB,+CAA+C,CAChD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAC1B,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,4BAA4B,IAAI,CAAC,OAAQ,CAAC,KAAK,UAAU,CAC1D,CACF,CAAC;QAEF,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,QAAkB;QAC1B,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;YACvC,MAAM,IAAI,gBAAgB,CACxB,6DAA6D,CAC9D,CAAC;QACJ,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;IAC3B,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,eAAe,CACnB,KAAgC,EAChC,KAAqD,EACrD,EAAY,EACZ,GAAG,IAAkC;QAErC,IAAI,CAAC,KAAK;YACR,MAAM,IAAI,aAAa,CAAC,4CAA4C,CAAC,CAAC;QACxE,MAAM,KAAK,GACT,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC/C,GAAG,CAAC,KAAK,CACP,kEAAkE,KAAK,IAAI,KAAK,EAAE,CACnF,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACtE,IAAI,CAAC;YACH,GAAG,CAAC,KAAK,CACP,oCAAoC,KAAK,IAAI,KAAK,KAAK,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,EAAE,CACxH,CAAC;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,MAAM,IAAI,aAAa,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAEQ,QAAQ;QACf,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,eAAe,iBAAiB,CAAC;IACtF,CAAC;CACF;AAED,IAAI,OAAO;IAAE,OAAO,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { QueryError } from "./errors.js";
|
|
|
3
3
|
import { apply, Decoration, Metadata, methodMetadata, propMetadata, } from "@decaf-ts/decoration";
|
|
4
4
|
import { PersistenceKeys } from "./../persistence/constants.js";
|
|
5
5
|
import { Operator } from "./constants.js";
|
|
6
|
+
import { Repository } from "@decaf-ts/db-decorators";
|
|
6
7
|
export function defaultQueryAttr() {
|
|
7
8
|
return function defaultQueryAttr(obj, prop) {
|
|
8
9
|
const key = Metadata.key(PersistenceKeys.DEFAULT_QUERY_ATTR);
|
|
@@ -30,9 +31,13 @@ export function query(options = {}) {
|
|
|
30
31
|
function innerQuery(options) {
|
|
31
32
|
return function innerQuery(obj, propertyKey, descriptor) {
|
|
32
33
|
descriptor.value = new Proxy(descriptor.value, {
|
|
33
|
-
apply(target, thisArg, args) {
|
|
34
|
+
async apply(target, thisArg, args) {
|
|
34
35
|
const { action, select, selector, where, groupBy, orderBy, limit, offset, } = MethodQueryBuilder.build(target.name, ...args);
|
|
36
|
+
if (!(thisArg instanceof Repository)) {
|
|
37
|
+
throw new Error("thisArg must be an instance of Repository");
|
|
38
|
+
}
|
|
35
39
|
const repo = thisArg;
|
|
40
|
+
const { log, ctx, ctxArgs } = (await repo['logCtx'](args, query.name, true)).for(query);
|
|
36
41
|
// Build statement based on action type
|
|
37
42
|
let stmt;
|
|
38
43
|
switch (action) {
|
|
@@ -120,9 +125,9 @@ export function query(options = {}) {
|
|
|
120
125
|
const pageSize = typeof lastArg === "number"
|
|
121
126
|
? lastArg
|
|
122
127
|
: (lastArg?.limit ?? 10);
|
|
123
|
-
return stmt.paginate(pageSize);
|
|
128
|
+
return stmt.paginate(pageSize, ctx);
|
|
124
129
|
}
|
|
125
|
-
return stmt.execute();
|
|
130
|
+
return stmt.execute(ctx);
|
|
126
131
|
},
|
|
127
132
|
});
|
|
128
133
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/query/decorators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,gCAA6B;AAC1D,OAAO,EAAE,UAAU,EAAE,oBAAiB;AACtC,OAAO,EACL,KAAK,EACL,UAAU,EACV,QAAQ,EACR,cAAc,EACd,YAAY,GACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,sCAAiC;AAE3D,OAAO,EAAE,QAAQ,EAAE,uBAAoB;
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/query/decorators.ts"],"names":[],"mappings":"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"}
|
package/lib/index.cjs
CHANGED
|
@@ -49,7 +49,7 @@ __exportStar(require("./persistence/index.cjs"), exports);
|
|
|
49
49
|
* @const VERSION
|
|
50
50
|
* @memberOf module:core
|
|
51
51
|
*/
|
|
52
|
-
exports.VERSION = "0.
|
|
52
|
+
exports.VERSION = "0.12.1";
|
|
53
53
|
/**
|
|
54
54
|
* @description Stores the current package version
|
|
55
55
|
* @summary A constant representing the version of the core package
|
package/lib/index.d.ts
CHANGED
|
@@ -22,7 +22,7 @@ export * from "./persistence";
|
|
|
22
22
|
* @const VERSION
|
|
23
23
|
* @memberOf module:core
|
|
24
24
|
*/
|
|
25
|
-
export declare const VERSION = "0.
|
|
25
|
+
export declare const VERSION = "0.12.1";
|
|
26
26
|
/**
|
|
27
27
|
* @description Stores the current package version
|
|
28
28
|
* @summary A constant representing the version of the core package
|
|
@@ -34,6 +34,17 @@ const constants_1 = require("./constants.cjs");
|
|
|
34
34
|
* ```
|
|
35
35
|
*/
|
|
36
36
|
class Dispatch extends ContextualLoggedClass_1.ContextualLoggedClass {
|
|
37
|
+
isSameObservedAdapter(observer) {
|
|
38
|
+
if (!this.adapter)
|
|
39
|
+
return false;
|
|
40
|
+
if (this.adapter === observer)
|
|
41
|
+
return true;
|
|
42
|
+
const current = this.adapter;
|
|
43
|
+
const candidate = observer;
|
|
44
|
+
if (!(candidate instanceof Adapter_1.Adapter))
|
|
45
|
+
return false;
|
|
46
|
+
return (current.alias === candidate.alias && current.flavour === candidate.flavour);
|
|
47
|
+
}
|
|
37
48
|
/**
|
|
38
49
|
* @description Creates a new Dispatch instance
|
|
39
50
|
* @summary Initializes a new Dispatch instance without any adapter
|
|
@@ -186,8 +197,11 @@ class Dispatch extends ContextualLoggedClass_1.ContextualLoggedClass {
|
|
|
186
197
|
observe(observer) {
|
|
187
198
|
if (!(observer instanceof Adapter_1.Adapter))
|
|
188
199
|
throw new errors_1.UnsupportedError("Only Adapters can be observed by dispatch");
|
|
189
|
-
if (this.adapter)
|
|
190
|
-
|
|
200
|
+
if (this.adapter) {
|
|
201
|
+
if (this.isSameObservedAdapter(observer))
|
|
202
|
+
return () => this.unObserve(observer);
|
|
203
|
+
throw new errors_1.UnsupportedError("Dispatch is already observing another adapter");
|
|
204
|
+
}
|
|
191
205
|
this.adapter = observer;
|
|
192
206
|
this.models = Adapter_1.Adapter.models(this.adapter.alias);
|
|
193
207
|
this.initialize().then(() => this.log.verbose(`Dispatch initialized for ${this.adapter.alias} adapter`));
|
|
@@ -200,7 +214,7 @@ class Dispatch extends ContextualLoggedClass_1.ContextualLoggedClass {
|
|
|
200
214
|
* @return {void}
|
|
201
215
|
*/
|
|
202
216
|
unObserve(observer) {
|
|
203
|
-
if (this.
|
|
217
|
+
if (!this.isSameObservedAdapter(observer))
|
|
204
218
|
throw new errors_1.UnsupportedError("Only the adapter that was used to observe can be unobserved");
|
|
205
219
|
this.adapter = undefined;
|
|
206
220
|
}
|
|
@@ -32,6 +32,7 @@ import { ContextualArgs, ContextualizedArgs, ContextualLoggedClass, MaybeContext
|
|
|
32
32
|
* ```
|
|
33
33
|
*/
|
|
34
34
|
export declare class Dispatch<A extends Adapter<any, any, any, any>> extends ContextualLoggedClass<ContextOf<A>> implements AdapterDispatch<A> {
|
|
35
|
+
private isSameObservedAdapter;
|
|
35
36
|
/**
|
|
36
37
|
* Indicates whether the dispatcher has already been initialized.
|
|
37
38
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dispatch.js","sourceRoot":"","sources":["../../src/persistence/Dispatch.ts"],"names":[],"mappings":";;;AAAA,2DAIiC;AACjC,yEAAyE;AAEzE,2CAAoC;AACpC,yCAA4C;AAG5C,gFAMwC;AACxC,+CAA8C;AAE9C;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAa,QACX,SAAQ,6CAAmC;
|
|
1
|
+
{"version":3,"file":"Dispatch.js","sourceRoot":"","sources":["../../src/persistence/Dispatch.ts"],"names":[],"mappings":"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"}
|
package/lib/query/decorators.cjs
CHANGED
|
@@ -10,6 +10,7 @@ const errors_1 = require("./errors.cjs");
|
|
|
10
10
|
const decoration_1 = require("@decaf-ts/decoration");
|
|
11
11
|
const constants_1 = require("./../persistence/constants.cjs");
|
|
12
12
|
const constants_2 = require("./constants.cjs");
|
|
13
|
+
const db_decorators_1 = require("@decaf-ts/db-decorators");
|
|
13
14
|
function defaultQueryAttr() {
|
|
14
15
|
return function defaultQueryAttr(obj, prop) {
|
|
15
16
|
const key = decoration_1.Metadata.key(constants_1.PersistenceKeys.DEFAULT_QUERY_ATTR);
|
|
@@ -37,9 +38,13 @@ function query(options = {}) {
|
|
|
37
38
|
function innerQuery(options) {
|
|
38
39
|
return function innerQuery(obj, propertyKey, descriptor) {
|
|
39
40
|
descriptor.value = new Proxy(descriptor.value, {
|
|
40
|
-
apply(target, thisArg, args) {
|
|
41
|
+
async apply(target, thisArg, args) {
|
|
41
42
|
const { action, select, selector, where, groupBy, orderBy, limit, offset, } = MethodQueryBuilder_1.MethodQueryBuilder.build(target.name, ...args);
|
|
43
|
+
if (!(thisArg instanceof db_decorators_1.Repository)) {
|
|
44
|
+
throw new Error("thisArg must be an instance of Repository");
|
|
45
|
+
}
|
|
42
46
|
const repo = thisArg;
|
|
47
|
+
const { log, ctx, ctxArgs } = (await repo['logCtx'](args, query.name, true)).for(query);
|
|
43
48
|
// Build statement based on action type
|
|
44
49
|
let stmt;
|
|
45
50
|
switch (action) {
|
|
@@ -127,9 +132,9 @@ function query(options = {}) {
|
|
|
127
132
|
const pageSize = typeof lastArg === "number"
|
|
128
133
|
? lastArg
|
|
129
134
|
: (lastArg?.limit ?? 10);
|
|
130
|
-
return stmt.paginate(pageSize);
|
|
135
|
+
return stmt.paginate(pageSize, ctx);
|
|
131
136
|
}
|
|
132
|
-
return stmt.execute();
|
|
137
|
+
return stmt.execute(ctx);
|
|
133
138
|
},
|
|
134
139
|
});
|
|
135
140
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/query/decorators.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/query/decorators.ts"],"names":[],"mappings":"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"}
|