joist-orm 1.131.1 → 1.132.0
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/build/relations/CustomCollection.d.ts +1 -2
- package/build/relations/CustomCollection.d.ts.map +1 -1
- package/build/relations/CustomCollection.js +2 -4
- package/build/relations/CustomCollection.js.map +1 -1
- package/build/relations/CustomReference.d.ts +1 -2
- package/build/relations/CustomReference.d.ts.map +1 -1
- package/build/relations/CustomReference.js +2 -4
- package/build/relations/CustomReference.js.map +1 -1
- package/package.json +2 -2
|
@@ -13,7 +13,7 @@ export type CustomCollectionOpts<T extends Entity, U extends Entity> = {
|
|
|
13
13
|
add?: (entity: T, other: U) => void;
|
|
14
14
|
remove?: (entity: T, other: U) => void;
|
|
15
15
|
/** Whether the reference is loaded, even w/o an explicit `.load` call, i.e. for DeepNew test instances. */
|
|
16
|
-
isLoaded
|
|
16
|
+
isLoaded: () => boolean;
|
|
17
17
|
};
|
|
18
18
|
/**
|
|
19
19
|
* Allows user-defined collections that will work in `populate` / preload hints.
|
|
@@ -29,7 +29,6 @@ export type CustomCollectionOpts<T extends Entity, U extends Entity> = {
|
|
|
29
29
|
export declare class CustomCollection<T extends Entity, U extends Entity> extends AbstractRelationImpl<T, U[]> implements Collection<T, U> {
|
|
30
30
|
private opts;
|
|
31
31
|
private loadPromise;
|
|
32
|
-
private _isLoaded;
|
|
33
32
|
constructor(entity: T, opts: CustomCollectionOpts<T, U>);
|
|
34
33
|
get get(): readonly U[];
|
|
35
34
|
get getWithDeleted(): readonly U[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomCollection.d.ts","sourceRoot":"","sources":["../../src/relations/CustomCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,UAAU,EAA0B,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI;IAGrE,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACnE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,SAAS,CAAC,EAAE,CAAC;IACjC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC;IACtC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IACjD,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IACpC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IACvC,2GAA2G;IAC3G,QAAQ,
|
|
1
|
+
{"version":3,"file":"CustomCollection.d.ts","sourceRoot":"","sources":["../../src/relations/CustomCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,6 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
20
20
|
// We keep both a promise+loaded flag and not an actual `this.loaded = await load` because
|
|
21
21
|
// the values can become stale; we want to each `.get` call to repeatedly evaluate the latest values.
|
|
22
22
|
loadPromise;
|
|
23
|
-
_isLoaded = false;
|
|
24
23
|
constructor(entity, opts) {
|
|
25
24
|
super(entity);
|
|
26
25
|
this.opts = opts;
|
|
@@ -32,7 +31,7 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
32
31
|
return this.doGet({ withDeleted: true });
|
|
33
32
|
}
|
|
34
33
|
get isLoaded() {
|
|
35
|
-
return this.
|
|
34
|
+
return this.opts.isLoaded();
|
|
36
35
|
}
|
|
37
36
|
async load(opts = {}) {
|
|
38
37
|
(0, index_1.ensureNotDeleted)(this.entity, "pending");
|
|
@@ -41,7 +40,6 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
41
40
|
this.loadPromise = this.opts.load(this.entity, opts);
|
|
42
41
|
await this.loadPromise;
|
|
43
42
|
this.loadPromise = undefined;
|
|
44
|
-
this._isLoaded = true;
|
|
45
43
|
}
|
|
46
44
|
else {
|
|
47
45
|
await this.loadPromise;
|
|
@@ -124,7 +122,7 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
124
122
|
}
|
|
125
123
|
ensureNewOrLoaded() {
|
|
126
124
|
// This should only be callable in the type system if we've already resolved this to an instance
|
|
127
|
-
if (this.isLoaded
|
|
125
|
+
if (this.isLoaded) {
|
|
128
126
|
return;
|
|
129
127
|
}
|
|
130
128
|
(0, index_1.fail)(`${this.entity}.${this.fieldName} was not loaded`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomCollection.js","sourceRoot":"","sources":["../../src/relations/CustomCollection.ts"],"names":[],"mappings":";;;AAEA,oCAA8D;AAC9D,iEAA8D;AAC9D,yCAAkD;AAelD;;;;;;;;;;GAUG;AACH,MAAa,gBACX,SAAQ,2CAA4B;
|
|
1
|
+
{"version":3,"file":"CustomCollection.js","sourceRoot":"","sources":["../../src/relations/CustomCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export type CustomReferenceOpts<T extends Entity, U extends Entity, N extends ne
|
|
|
11
11
|
get: (entity: T) => U | N;
|
|
12
12
|
set?: (entity: T, other: U) => void;
|
|
13
13
|
/** Whether the reference is loaded, even w/o an explicit `.load` call, i.e. for DeepNew test instances. */
|
|
14
|
-
isLoaded
|
|
14
|
+
isLoaded: () => boolean;
|
|
15
15
|
};
|
|
16
16
|
/**
|
|
17
17
|
* Allows user-defined references that will work in `populate` / preload hints.
|
|
@@ -27,7 +27,6 @@ export type CustomReferenceOpts<T extends Entity, U extends Entity, N extends ne
|
|
|
27
27
|
export declare class CustomReference<T extends Entity, U extends Entity, N extends never | undefined> extends AbstractRelationImpl<T, U> implements Reference<T, U, N> {
|
|
28
28
|
private opts;
|
|
29
29
|
private loadPromise;
|
|
30
|
-
private _isLoaded;
|
|
31
30
|
constructor(entity: T, opts: CustomReferenceOpts<T, U, N>);
|
|
32
31
|
get get(): U | N;
|
|
33
32
|
get getWithDeleted(): U | N;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomReference.d.ts","sourceRoot":"","sources":["../../src/relations/CustomReference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAA0B,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,KAAK,GAAG,SAAS,IAAI;IAGjG,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IACpC,2GAA2G;IAC3G,QAAQ,
|
|
1
|
+
{"version":3,"file":"CustomReference.d.ts","sourceRoot":"","sources":["../../src/relations/CustomReference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAA0B,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,KAAK,GAAG,SAAS,IAAI;IAGjG,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IACpC,2GAA2G;IAC3G,QAAQ,EAAE,MAAM,OAAO,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,qBAAa,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,KAAK,GAAG,SAAS,CAC1F,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,CACjC,YAAW,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAQ3B,OAAO,CAAC,IAAI;IAJd,OAAO,CAAC,WAAW,CAA+B;gBAGhD,MAAM,EAAE,CAAC,EACD,IAAI,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAK5C,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAEf;IAED,IAAI,cAAc,IAAI,CAAC,GAAG,CAAC,CAE1B;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAEK,IAAI,CAAC,IAAI,GAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;IAcvF,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,OAAO,IAAI,IAAI;IAIf,IAAI,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAEhB;IAED,IAAI,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAEjC;IAED,IAAI,aAAa,IAAI,QAAQ,GAAG,SAAS,CAExC;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAI,KAAK,IAAI,OAAO,CAInB;IAED,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IAYnB,WAAW,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IAKrB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAC7C,kBAAkB,IAAI,IAAI;IAE1B,0GAA0G;IAC1G,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,QAAQ,IAAI,MAAM;IAIlB,OAAO,CAAC,KAAK;IAMb,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAQzB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAS;IACvB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAS;IACvB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAS;CACzB"}
|
|
@@ -21,7 +21,6 @@ class CustomReference extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
21
21
|
// We keep both a promise+loaded flag and not an actual `this.loaded = await load` because
|
|
22
22
|
// the value can become stale; we want to each `.get` call to repeatedly evaluate the latest value.
|
|
23
23
|
loadPromise;
|
|
24
|
-
_isLoaded = false;
|
|
25
24
|
constructor(entity, opts) {
|
|
26
25
|
super(entity);
|
|
27
26
|
this.opts = opts;
|
|
@@ -33,7 +32,7 @@ class CustomReference extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
33
32
|
return this.doGet({ withDeleted: true });
|
|
34
33
|
}
|
|
35
34
|
get isLoaded() {
|
|
36
|
-
return this.
|
|
35
|
+
return this.opts.isLoaded();
|
|
37
36
|
}
|
|
38
37
|
async load(opts = {}) {
|
|
39
38
|
(0, index_1.ensureNotDeleted)(this.entity, "pending");
|
|
@@ -42,7 +41,6 @@ class CustomReference extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
42
41
|
this.loadPromise = this.opts.load(this.entity, opts);
|
|
43
42
|
await this.loadPromise;
|
|
44
43
|
this.loadPromise = undefined;
|
|
45
|
-
this._isLoaded = true;
|
|
46
44
|
}
|
|
47
45
|
else {
|
|
48
46
|
await this.loadPromise;
|
|
@@ -110,7 +108,7 @@ class CustomReference extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
110
108
|
}
|
|
111
109
|
ensureNewOrLoaded() {
|
|
112
110
|
// This should only be callable in the type system if we've already resolved this to an instance
|
|
113
|
-
if (this.isLoaded
|
|
111
|
+
if (this.isLoaded) {
|
|
114
112
|
return;
|
|
115
113
|
}
|
|
116
114
|
(0, index_1.fail)(`${this.entity}.${this.fieldName} was not loaded`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomReference.js","sourceRoot":"","sources":["../../src/relations/CustomReference.ts"],"names":[],"mappings":";;;AAEA,oCAA6D;AAC7D,iEAA8D;AAC9D,2CAAyC;AACzC,yCAAkD;AAYlD;;;;;;;;;;GAUG;AACH,MAAa,eACX,SAAQ,2CAA0B;
|
|
1
|
+
{"version":3,"file":"CustomReference.js","sourceRoot":"","sources":["../../src/relations/CustomReference.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "joist-orm",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.132.0",
|
|
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.5",
|
|
23
23
|
"dataloader": "^2.2.2",
|
|
24
|
-
"joist-utils": "1.
|
|
24
|
+
"joist-utils": "1.132.0",
|
|
25
25
|
"knex": "^3.0.1",
|
|
26
26
|
"object-hash": "^3.0.0",
|
|
27
27
|
"pg": "^8.11.3"
|