joist-orm 1.144.5 → 1.144.7
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.
|
@@ -107,7 +107,7 @@ function buildCondition(cc) {
|
|
|
107
107
|
case "in":
|
|
108
108
|
return [`${columnName} = any(?)`, [cond.value]];
|
|
109
109
|
case "nin":
|
|
110
|
-
return [`${columnName} !=
|
|
110
|
+
return [`${columnName} != all(?)`, [cond.value]];
|
|
111
111
|
case "between":
|
|
112
112
|
return [`${columnName} between ? and ?`, cond.value];
|
|
113
113
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasAsyncMethod.d.ts","sourceRoot":"","sources":["../../src/relations/hasAsyncMethod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAY,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"hasAsyncMethod.d.ts","sourceRoot":"","sources":["../../src/relations/hasAsyncMethod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAY,MAAM,cAAc,CAAC;AAE1D,QAAA,MAAM,YAAY,eAAW,CAAC;AAC9B,eAAO,MAAM,yBAAyB,eAAW,CAAC;AAElD,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC;IAEnE,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC;IACpE,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;CACrB;AAED,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EAClG,QAAQ,EAAE,CAAC,EACX,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,GAC1C,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAGtB;AAED,qBAAa,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,CAC1F,YAAW,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;IAU7B,OAAO,CAAC,EAAE;IARZ,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,WAAW,CAA2B;gBAK5C,MAAM,EAAE,CAAC,EACT,IAAI,EAAE,CAAC,EACC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC;IAMrD,oGAAoG;IAC9F,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAUlC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC;IAOnB,IAAI,QAAQ,YAEX;IAED,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC;CAC3B"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AsyncMethodImpl = exports.hasAsyncMethod = exports.AsyncMethodPopulateSecret = void 0;
|
|
4
4
|
const BaseEntity_1 = require("../BaseEntity");
|
|
5
5
|
const loadHints_1 = require("../loadHints");
|
|
6
|
-
const utils_1 = require("../utils");
|
|
7
6
|
const AsyncMethodM = Symbol();
|
|
8
7
|
exports.AsyncMethodPopulateSecret = Symbol();
|
|
9
8
|
function hasAsyncMethod(loadHint, fn) {
|
|
@@ -23,17 +22,14 @@ class AsyncMethodImpl {
|
|
|
23
22
|
this.#hint = hint;
|
|
24
23
|
}
|
|
25
24
|
/** Args might be either the user-provided args, or the populate `opts` if we're being preloaded. */
|
|
26
|
-
load(...args) {
|
|
25
|
+
async load(...args) {
|
|
27
26
|
// Are we being called by `em.populate`? If so, we don't have the real args, so avoid invoking fn
|
|
28
27
|
const isPopulate = args && typeof args[0] === "object" && exports.AsyncMethodPopulateSecret in args[0];
|
|
29
|
-
const { fn } = this;
|
|
30
28
|
if (!this.loaded) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
return isPopulate ? undefined : fn(loaded, ...args);
|
|
34
|
-
}));
|
|
29
|
+
this.loadPromise ??= this.#entity.em.populate(this.#entity, this.#hint).then((loaded) => (this.loaded = true));
|
|
30
|
+
await this.loadPromise;
|
|
35
31
|
}
|
|
36
|
-
return isPopulate ? undefined :
|
|
32
|
+
return isPopulate ? undefined : this.call(...args);
|
|
37
33
|
}
|
|
38
34
|
call(...args) {
|
|
39
35
|
if (!this.isLoaded) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasAsyncMethod.js","sourceRoot":"","sources":["../../src/relations/hasAsyncMethod.ts"],"names":[],"mappings":";;;AAAA,8CAA6D;AAE7D,4CAA0D;
|
|
1
|
+
{"version":3,"file":"hasAsyncMethod.js","sourceRoot":"","sources":["../../src/relations/hasAsyncMethod.ts"],"names":[],"mappings":";;;AAAA,8CAA6D;AAE7D,4CAA0D;AAE1D,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC;AACjB,QAAA,yBAAyB,GAAG,MAAM,EAAE,CAAC;AAalD,SAAgB,cAAc,CAC5B,QAAW,EACX,EAA2C;IAE3C,MAAM,MAAM,GAAG,yCAAiC,CAAC;IACjD,OAAO,IAAI,eAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AACnD,CAAC;AAND,wCAMC;AAED,MAAa,eAAe;IAWhB;IARF,MAAM,GAAG,KAAK,CAAC;IACf,WAAW,CAA2B;IAErC,OAAO,CAAI;IACX,KAAK,CAAI;IAClB,YACE,MAAS,EACT,IAAO,EACC,EAA2C;QAA3C,OAAE,GAAF,EAAE,CAAyC;QAEnD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,oGAAoG;IACpG,KAAK,CAAC,IAAI,CAAC,GAAG,IAAO;QACnB,iGAAiG;QACjG,MAAM,UAAU,GAAG,IAAI,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,iCAAyB,IAAK,IAAY,CAAC,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAM,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;YAChH,MAAM,IAAI,CAAC,WAAW,CAAC;QACzB,CAAC;QACD,OAAO,UAAU,CAAC,CAAC,CAAE,SAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,CAAC,GAAG,IAAO;QACb,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAuB,EAAE,GAAG,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,MAAM,IAAI,IAAA,oBAAQ,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED,CAAC,YAAY,CAAC,CAAY;CAC3B;AAxCD,0CAwCC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "joist-orm",
|
|
3
|
-
"version": "1.144.
|
|
3
|
+
"version": "1.144.7",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@types/object-hash": "^3.0.6",
|
|
23
23
|
"dataloader": "^2.2.2",
|
|
24
|
-
"joist-utils": "1.144.
|
|
24
|
+
"joist-utils": "1.144.7",
|
|
25
25
|
"knex": "^3.1.0",
|
|
26
26
|
"object-hash": "^3.0.0",
|
|
27
27
|
"pg": "^8.11.3",
|