joist-orm 1.208.3 → 1.208.4

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.
@@ -1 +1 @@
1
- {"version":3,"file":"withLoaded.d.ts","sourceRoot":"","sources":["../src/withLoaded.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAgB,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAOL,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,aAAa,CAAC;AAKrB,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG;KAC3F,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,oBAAoB,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAClE,CAAC,CAAC,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GACnC,CAAC,GAAG,CAAC,GACL,CAAC,CAAC,CAAC,CAAC,GACN,CAAC,CAAC,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,GAC7C,CAAC,GACD,CAAC,CAAC,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,GACjD,CAAC,GAAG,SAAS,GACb,CAAC,CAAC,CAAC,CAAC,SAAS,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GACvC,CAAC,EAAE,GACH,CAAC,CAAC,CAAC,CAAC,SAAS,cAAc,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GACrC,CAAC,GACD,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EACxF,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAClB,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChC,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EACxF,MAAM,EAAE,CAAC,GACR,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAyBvB,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9F,MAAM,EAAE,CAAC,EACT,IAAI,EAAE,CAAC,GACN,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAGrB"}
1
+ {"version":3,"file":"withLoaded.d.ts","sourceRoot":"","sources":["../src/withLoaded.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAgB,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EASL,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,aAAa,CAAC;AAMrB,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG;KAC3F,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,oBAAoB,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAClE,CAAC,CAAC,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GACnC,CAAC,GAAG,CAAC,GACL,CAAC,CAAC,CAAC,CAAC,GACN,CAAC,CAAC,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,GAC7C,CAAC,GACD,CAAC,CAAC,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,GACjD,CAAC,GAAG,SAAS,GACb,CAAC,CAAC,CAAC,CAAC,SAAS,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GACvC,CAAC,EAAE,GACH,CAAC,CAAC,CAAC,CAAC,SAAS,cAAc,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GACrC,CAAC,GACD,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EACxF,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAClB,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChC,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EACxF,MAAM,EAAE,CAAC,GACR,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAiCvB,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9F,MAAM,EAAE,CAAC,EACT,IAAI,EAAE,CAAC,GACN,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAGrB"}
@@ -4,16 +4,23 @@ exports.withLoaded = withLoaded;
4
4
  exports.ensureWithLoaded = ensureWithLoaded;
5
5
  const loadHints_1 = require("./loadHints");
6
6
  const relations_1 = require("./relations");
7
+ const ReactiveQueryField_1 = require("./relations/ReactiveQueryField");
7
8
  const utils_1 = require("./utils");
8
9
  function withLoaded(loadedOrPromise) {
9
10
  return (0, utils_1.maybePromiseThen)(loadedOrPromise, (loaded) => new Proxy(loaded, {
10
11
  get: (target, prop) => {
11
12
  const value = target[prop];
12
- if ((0, relations_1.isRelation)(value) || (0, relations_1.isAsyncProperty)(value)) {
13
+ if ((0, relations_1.isRelation)(value) ||
14
+ (0, relations_1.isAsyncProperty)(value) ||
15
+ (0, relations_1.isReactiveField)(value) ||
16
+ (0, relations_1.isReactiveGetter)(value) ||
17
+ (0, relations_1.isReactiveQueryField)(value)) {
13
18
  return (0, relations_1.isLoadedReference)(value) ||
14
19
  (0, relations_1.isLoadedCollection)(value) ||
15
20
  (0, relations_1.isLoadedAsyncProperty)(value) ||
16
- (0, relations_1.isReactiveField)(value)
21
+ (0, relations_1.isReactiveField)(value) ||
22
+ (0, ReactiveQueryField_1.isLoadedReactiveQueryField)(value) ||
23
+ (0, relations_1.isReactiveGetter)(value)
17
24
  ? value.get
18
25
  : (0, utils_1.fail)(`${target}.${String(prop)} is not loaded`);
19
26
  }
@@ -1 +1 @@
1
- {"version":3,"file":"withLoaded.js","sourceRoot":"","sources":["../src/withLoaded.ts"],"names":[],"mappings":";;AA4DA,gCAsBC;AAED,4CAMC;AAzFD,2CAA6D;AAC7D,2CAWqB;AACrB,mCAA+D;AA8C/D,SAAgB,UAAU,CACxB,eAAoC;IAEpC,OAAO,IAAA,wBAAgB,EACrB,eAAe,EACf,CAAC,MAAM,EAAE,EAAE,CACT,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YACpB,MAAM,KAAK,GAAS,MAAc,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,IAAA,sBAAU,EAAC,KAAK,CAAC,IAAI,IAAA,2BAAe,EAAC,KAAK,CAAC,EAAE,CAAC;gBAChD,OAAO,IAAA,6BAAiB,EAAC,KAAK,CAAC;oBAC7B,IAAA,8BAAkB,EAAC,KAAK,CAAC;oBACzB,IAAA,iCAAqB,EAAC,KAAK,CAAC;oBAC5B,IAAA,2BAAe,EAAC,KAAK,CAAC;oBACtB,CAAC,CAAC,KAAK,CAAC,GAAG;oBACX,CAAC,CAAC,IAAA,YAAI,EAAC,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;KACF,CAAwB,CAC5B,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAC9B,MAAS,EACT,IAAO;IAEP,IAAA,wBAAY,EAAU,MAAM,EAAE,IAAI,CAAC,CAAC;IACpC,OAAO,UAAU,CAAU,MAAM,CAAC,CAAC;AACrC,CAAC"}
1
+ {"version":3,"file":"withLoaded.js","sourceRoot":"","sources":["../src/withLoaded.ts"],"names":[],"mappings":";;AA+DA,gCA8BC;AAED,4CAMC;AApGD,2CAA6D;AAC7D,2CAaqB;AACrB,uEAA4E;AAC5E,mCAA+D;AA8C/D,SAAgB,UAAU,CACxB,eAAoC;IAEpC,OAAO,IAAA,wBAAgB,EACrB,eAAe,EACf,CAAC,MAAM,EAAE,EAAE,CACT,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YACpB,MAAM,KAAK,GAAS,MAAc,CAAC,IAAI,CAAC,CAAC;YACzC,IACE,IAAA,sBAAU,EAAC,KAAK,CAAC;gBACjB,IAAA,2BAAe,EAAC,KAAK,CAAC;gBACtB,IAAA,2BAAe,EAAC,KAAK,CAAC;gBACtB,IAAA,4BAAgB,EAAC,KAAK,CAAC;gBACvB,IAAA,gCAAoB,EAAC,KAAK,CAAC,EAC3B,CAAC;gBACD,OAAO,IAAA,6BAAiB,EAAC,KAAK,CAAC;oBAC7B,IAAA,8BAAkB,EAAC,KAAK,CAAC;oBACzB,IAAA,iCAAqB,EAAC,KAAK,CAAC;oBAC5B,IAAA,2BAAe,EAAC,KAAK,CAAC;oBACtB,IAAA,+CAA0B,EAAC,KAAK,CAAC;oBACjC,IAAA,4BAAgB,EAAC,KAAK,CAAC;oBACvB,CAAC,CAAC,KAAK,CAAC,GAAG;oBACX,CAAC,CAAC,IAAA,YAAI,EAAC,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;KACF,CAAwB,CAC5B,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAC9B,MAAS,EACT,IAAO;IAEP,IAAA,wBAAY,EAAU,MAAM,EAAE,IAAI,CAAC,CAAC;IACpC,OAAO,UAAU,CAAU,MAAM,CAAC,CAAC;AACrC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "joist-orm",
3
- "version": "1.208.3",
3
+ "version": "1.208.4",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -22,7 +22,7 @@
22
22
  "@types/object-hash": "^3.0.6",
23
23
  "ansis": "^3.3.2",
24
24
  "dataloader": "^2.2.2",
25
- "joist-utils": "1.208.3",
25
+ "joist-utils": "1.208.4",
26
26
  "knex": "^3.1.0",
27
27
  "object-hash": "^3.0.0",
28
28
  "pg": "^8.13.0",