velocious 1.0.407 → 1.0.408
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/build/src/frontend-model-controller.d.ts +18 -0
- package/build/src/frontend-model-controller.d.ts.map +1 -1
- package/build/src/frontend-model-controller.js +38 -4
- package/build/src/frontend-models/base.d.ts +29 -0
- package/build/src/frontend-models/base.d.ts.map +1 -1
- package/build/src/frontend-models/base.js +37 -1
- package/build/src/frontend-models/preloader.d.ts +66 -0
- package/build/src/frontend-models/preloader.d.ts.map +1 -0
- package/build/src/frontend-models/preloader.js +139 -0
- package/build/src/frontend-models/query.d.ts +24 -1
- package/build/src/frontend-models/query.d.ts.map +1 -1
- package/build/src/frontend-models/query.js +31 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Preloads relationships onto already-loaded frontend model instances.
|
|
3
|
+
*
|
|
4
|
+
* Unlike the backend ORM preloader (which queries relationship tables
|
|
5
|
+
* directly), the frontend re-fetches the parent records through their
|
|
6
|
+
* `index` endpoint with the preload/select params, then copies the resulting
|
|
7
|
+
* top-level preloaded relationships onto the existing instances. Relationships
|
|
8
|
+
* that are already preloaded with the required columns present are skipped,
|
|
9
|
+
* so repeated calls reuse the relationship cache instead of issuing duplicate
|
|
10
|
+
* requests.
|
|
11
|
+
*/
|
|
12
|
+
export default class FrontendModelPreloader {
|
|
13
|
+
/**
|
|
14
|
+
* @param {Array<import("./base.js").default>} models - Frontend model instances to preload onto.
|
|
15
|
+
* @param {import("./query.js").default<any> | import("../database/query/index.js").NestedPreloadRecord | string | Array<string | import("../database/query/index.js").NestedPreloadRecord>} queryOrSpec - A query built via `Model.preload(...).select(...)`, or a raw preload spec.
|
|
16
|
+
* @param {{force?: boolean}} [options] - Options.
|
|
17
|
+
* @returns {Promise<void>} - Resolves when preloading completes.
|
|
18
|
+
*/
|
|
19
|
+
static preload(models: Array<import("./base.js").default>, queryOrSpec: import("./query.js").default<any> | import("../database/query/index.js").NestedPreloadRecord | string | Array<string | import("../database/query/index.js").NestedPreloadRecord>, { force }?: {
|
|
20
|
+
force?: boolean;
|
|
21
|
+
}): Promise<void>;
|
|
22
|
+
/**
|
|
23
|
+
* @param {object} args - Options object.
|
|
24
|
+
* @param {typeof import("./base.js").default} args.modelClass - Model class the preload graph is rooted at.
|
|
25
|
+
* @param {import("./base.js").default} args.model - Model instance.
|
|
26
|
+
* @param {import("../database/query/index.js").NestedPreloadRecord} args.preload - Preload sub-graph to satisfy.
|
|
27
|
+
* @param {import("./query.js").default<any>} args.query - Source query carrying select/selectsExtra.
|
|
28
|
+
* @param {boolean} args.force - Whether to reload regardless of cached state.
|
|
29
|
+
* @returns {boolean} - Whether the model needs a reload request.
|
|
30
|
+
*/
|
|
31
|
+
static _modelNeedsReload({ modelClass, model, preload, query, force }: {
|
|
32
|
+
modelClass: typeof import("./base.js").default;
|
|
33
|
+
model: import("./base.js").default;
|
|
34
|
+
preload: import("../database/query/index.js").NestedPreloadRecord;
|
|
35
|
+
query: import("./query.js").default<any>;
|
|
36
|
+
force: boolean;
|
|
37
|
+
}): boolean;
|
|
38
|
+
/**
|
|
39
|
+
* A relationship is satisfied when it is already preloaded, every required
|
|
40
|
+
* `select` attribute is present on each loaded target, and any nested preload
|
|
41
|
+
* sub-graph is recursively satisfied on those targets. `selectsExtra` can
|
|
42
|
+
* never be proven satisfied from the cache (the backend serializes the
|
|
43
|
+
* client-unknown default attributes plus the extras), so it always reloads.
|
|
44
|
+
* With no select and no nested preload, being preloaded is enough.
|
|
45
|
+
* @param {object} args - Options object.
|
|
46
|
+
* @param {typeof import("./base.js").default} args.modelClass - Model class owning the relationship.
|
|
47
|
+
* @param {import("./base.js").default} args.model - Model instance.
|
|
48
|
+
* @param {string} args.relationshipName - Relationship name.
|
|
49
|
+
* @param {import("../database/query/index.js").NestedPreloadRecord[string]} args.subPreload - Preload value for this relationship (`true` or a nested record).
|
|
50
|
+
* @param {import("./query.js").default<any>} args.query - Source query carrying select/selectsExtra.
|
|
51
|
+
* @returns {boolean} - Whether the relationship is already satisfied.
|
|
52
|
+
*/
|
|
53
|
+
static _relationshipSatisfied({ modelClass, model, relationshipName, subPreload, query }: {
|
|
54
|
+
modelClass: typeof import("./base.js").default;
|
|
55
|
+
model: import("./base.js").default;
|
|
56
|
+
relationshipName: string;
|
|
57
|
+
subPreload: import("../database/query/index.js").NestedPreloadRecord[string];
|
|
58
|
+
query: import("./query.js").default<any>;
|
|
59
|
+
}): boolean;
|
|
60
|
+
/**
|
|
61
|
+
* @param {import("../database/query/index.js").NestedPreloadRecord[string]} subPreload - Preload value for a relationship.
|
|
62
|
+
* @returns {import("../database/query/index.js").NestedPreloadRecord | null} - Nested preload record, or null when there is no deeper graph.
|
|
63
|
+
*/
|
|
64
|
+
static _nestedPreloadRecord(subPreload: import("../database/query/index.js").NestedPreloadRecord[string]): import("../database/query/index.js").NestedPreloadRecord | null;
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=preloader.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preloader.d.ts","sourceRoot":"","sources":["../../../src/frontend-models/preloader.js"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AACH;IACE;;;;;OAKG;IACH,uBALW,KAAK,CAAC,OAAO,WAAW,EAAE,OAAO,CAAC,eAClC,OAAO,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,4BAA4B,EAAE,mBAAmB,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,OAAO,4BAA4B,EAAE,mBAAmB,CAAC,cAChL;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAC,GACf,OAAO,CAAC,IAAI,CAAC,CAuDzB;IAED;;;;;;;;OAQG;IACH,uEAPG;QAAiD,UAAU,EAAnD,cAAc,WAAW,EAAE,OAAO;QACA,KAAK,EAAvC,OAAO,WAAW,EAAE,OAAO;QACoC,OAAO,EAAtE,OAAO,4BAA4B,EAAE,mBAAmB;QAChB,KAAK,EAA7C,OAAO,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC;QACnB,KAAK,EAAnB,OAAO;KACf,GAAU,OAAO,CAUnB;IAED;;;;;;;;;;;;;;OAcG;IACH,0FAPG;QAAiD,UAAU,EAAnD,cAAc,WAAW,EAAE,OAAO;QACA,KAAK,EAAvC,OAAO,WAAW,EAAE,OAAO;QACd,gBAAgB,EAA7B,MAAM;QACiE,UAAU,EAAjF,OAAO,4BAA4B,EAAE,mBAAmB,CAAC,MAAM,CAAC;QACxB,KAAK,EAA7C,OAAO,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC;KACzC,GAAU,OAAO,CAsCnB;IAED;;;OAGG;IACH,wCAHW,OAAO,4BAA4B,EAAE,mBAAmB,CAAC,MAAM,CAAC,GAC9D,OAAO,4BAA4B,EAAE,mBAAmB,GAAG,IAAI,CAO3E;CACF"}
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
/**
|
|
3
|
+
* Preloads relationships onto already-loaded frontend model instances.
|
|
4
|
+
*
|
|
5
|
+
* Unlike the backend ORM preloader (which queries relationship tables
|
|
6
|
+
* directly), the frontend re-fetches the parent records through their
|
|
7
|
+
* `index` endpoint with the preload/select params, then copies the resulting
|
|
8
|
+
* top-level preloaded relationships onto the existing instances. Relationships
|
|
9
|
+
* that are already preloaded with the required columns present are skipped,
|
|
10
|
+
* so repeated calls reuse the relationship cache instead of issuing duplicate
|
|
11
|
+
* requests.
|
|
12
|
+
*/
|
|
13
|
+
export default class FrontendModelPreloader {
|
|
14
|
+
/**
|
|
15
|
+
* @param {Array<import("./base.js").default>} models - Frontend model instances to preload onto.
|
|
16
|
+
* @param {import("./query.js").default<any> | import("../database/query/index.js").NestedPreloadRecord | string | Array<string | import("../database/query/index.js").NestedPreloadRecord>} queryOrSpec - A query built via `Model.preload(...).select(...)`, or a raw preload spec.
|
|
17
|
+
* @param {{force?: boolean}} [options] - Options.
|
|
18
|
+
* @returns {Promise<void>} - Resolves when preloading completes.
|
|
19
|
+
*/
|
|
20
|
+
static async preload(models, queryOrSpec, { force = false } = {}) {
|
|
21
|
+
if (!models || models.length === 0)
|
|
22
|
+
return;
|
|
23
|
+
const modelClass = /** @type {typeof import("./base.js").default} */ (models[0].constructor);
|
|
24
|
+
const isQuery = Boolean(queryOrSpec) && typeof queryOrSpec === "object" && "_preload" in queryOrSpec;
|
|
25
|
+
const query = isQuery
|
|
26
|
+
? /** @type {import("./query.js").default<any>} */ (queryOrSpec)
|
|
27
|
+
: modelClass.preload(/** @type {any} */ (queryOrSpec));
|
|
28
|
+
const topLevelRelationships = Object.keys(query._preload);
|
|
29
|
+
if (topLevelRelationships.length === 0)
|
|
30
|
+
return;
|
|
31
|
+
const modelsToLoad = models.filter((model) => this._modelNeedsReload({ modelClass, model, preload: query._preload, query, force }));
|
|
32
|
+
if (modelsToLoad.length === 0)
|
|
33
|
+
return;
|
|
34
|
+
const primaryKey = modelClass.primaryKey();
|
|
35
|
+
const ids = modelsToLoad.map((model) => model.primaryKeyValue());
|
|
36
|
+
// Rebuild a fresh query carrying only the projection-relevant state so a
|
|
37
|
+
// user-supplied limit/sort/where on the source query doesn't leak in.
|
|
38
|
+
const reloadQuery = modelClass.preload(query._preload);
|
|
39
|
+
reloadQuery._select = query._select;
|
|
40
|
+
reloadQuery._selectsExtra = query._selectsExtra;
|
|
41
|
+
reloadQuery._withCount = query._withCount;
|
|
42
|
+
reloadQuery._abilities = query._abilities;
|
|
43
|
+
reloadQuery._queryData = query._queryData;
|
|
44
|
+
reloadQuery.where({ [primaryKey]: ids });
|
|
45
|
+
const reloaded = await reloadQuery.toArray();
|
|
46
|
+
/** @type {Map<string, import("./base.js").default>} */
|
|
47
|
+
const reloadedById = new Map();
|
|
48
|
+
for (const reloadedModel of reloaded) {
|
|
49
|
+
reloadedById.set(String(reloadedModel.primaryKeyValue()), reloadedModel);
|
|
50
|
+
}
|
|
51
|
+
for (const model of modelsToLoad) {
|
|
52
|
+
const reloadedModel = reloadedById.get(String(model.primaryKeyValue()));
|
|
53
|
+
// The record may have been deleted/filtered between the original load and
|
|
54
|
+
// this preload — skip it rather than crashing on a missing reload.
|
|
55
|
+
if (!reloadedModel)
|
|
56
|
+
continue;
|
|
57
|
+
for (const relationshipName of topLevelRelationships) {
|
|
58
|
+
const value = reloadedModel.getRelationshipByName(relationshipName).loaded();
|
|
59
|
+
model.getRelationshipByName(relationshipName).setLoaded(value);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* @param {object} args - Options object.
|
|
65
|
+
* @param {typeof import("./base.js").default} args.modelClass - Model class the preload graph is rooted at.
|
|
66
|
+
* @param {import("./base.js").default} args.model - Model instance.
|
|
67
|
+
* @param {import("../database/query/index.js").NestedPreloadRecord} args.preload - Preload sub-graph to satisfy.
|
|
68
|
+
* @param {import("./query.js").default<any>} args.query - Source query carrying select/selectsExtra.
|
|
69
|
+
* @param {boolean} args.force - Whether to reload regardless of cached state.
|
|
70
|
+
* @returns {boolean} - Whether the model needs a reload request.
|
|
71
|
+
*/
|
|
72
|
+
static _modelNeedsReload({ modelClass, model, preload, query, force }) {
|
|
73
|
+
if (force)
|
|
74
|
+
return true;
|
|
75
|
+
for (const relationshipName of Object.keys(preload)) {
|
|
76
|
+
if (!this._relationshipSatisfied({ modelClass, model, relationshipName, subPreload: preload[relationshipName], query }))
|
|
77
|
+
return true;
|
|
78
|
+
}
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* A relationship is satisfied when it is already preloaded, every required
|
|
83
|
+
* `select` attribute is present on each loaded target, and any nested preload
|
|
84
|
+
* sub-graph is recursively satisfied on those targets. `selectsExtra` can
|
|
85
|
+
* never be proven satisfied from the cache (the backend serializes the
|
|
86
|
+
* client-unknown default attributes plus the extras), so it always reloads.
|
|
87
|
+
* With no select and no nested preload, being preloaded is enough.
|
|
88
|
+
* @param {object} args - Options object.
|
|
89
|
+
* @param {typeof import("./base.js").default} args.modelClass - Model class owning the relationship.
|
|
90
|
+
* @param {import("./base.js").default} args.model - Model instance.
|
|
91
|
+
* @param {string} args.relationshipName - Relationship name.
|
|
92
|
+
* @param {import("../database/query/index.js").NestedPreloadRecord[string]} args.subPreload - Preload value for this relationship (`true` or a nested record).
|
|
93
|
+
* @param {import("./query.js").default<any>} args.query - Source query carrying select/selectsExtra.
|
|
94
|
+
* @returns {boolean} - Whether the relationship is already satisfied.
|
|
95
|
+
*/
|
|
96
|
+
static _relationshipSatisfied({ modelClass, model, relationshipName, subPreload, query }) {
|
|
97
|
+
const relationship = model.getRelationshipByName(relationshipName);
|
|
98
|
+
if (!relationship.getPreloaded())
|
|
99
|
+
return false;
|
|
100
|
+
const targetModelClass = modelClass.relationshipModelClass(relationshipName);
|
|
101
|
+
const loaded = relationship.loaded();
|
|
102
|
+
const targets = loaded == null ? [] : (Array.isArray(loaded) ? loaded : [loaded]);
|
|
103
|
+
if (targetModelClass) {
|
|
104
|
+
const targetModelName = targetModelClass.getModelName();
|
|
105
|
+
// `selectsExtra` serializes the default attributes (unknown to the client)
|
|
106
|
+
// plus the extras, so a cached target can't be proven complete.
|
|
107
|
+
if (query._selectsExtra[targetModelName])
|
|
108
|
+
return false;
|
|
109
|
+
const required = query._select[targetModelName] || [];
|
|
110
|
+
for (const target of targets) {
|
|
111
|
+
for (const attributeName of required) {
|
|
112
|
+
if (!target.hasLoadedAttribute(attributeName))
|
|
113
|
+
return false;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
const nestedPreload = this._nestedPreloadRecord(subPreload);
|
|
118
|
+
if (nestedPreload && targetModelClass) {
|
|
119
|
+
for (const target of targets) {
|
|
120
|
+
if (this._modelNeedsReload({ modelClass: targetModelClass, model: target, preload: nestedPreload, query, force: false })) {
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return true;
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* @param {import("../database/query/index.js").NestedPreloadRecord[string]} subPreload - Preload value for a relationship.
|
|
129
|
+
* @returns {import("../database/query/index.js").NestedPreloadRecord | null} - Nested preload record, or null when there is no deeper graph.
|
|
130
|
+
*/
|
|
131
|
+
static _nestedPreloadRecord(subPreload) {
|
|
132
|
+
if (!subPreload || typeof subPreload !== "object")
|
|
133
|
+
return null;
|
|
134
|
+
if (Object.keys(subPreload).length === 0)
|
|
135
|
+
return null;
|
|
136
|
+
return /** @type {import("../database/query/index.js").NestedPreloadRecord} */ (subPreload);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"preloader.js","sourceRoot":"","sources":["../../../src/frontend-models/preloader.js"],"names":[],"mappings":"AAAA,YAAY;AAEZ;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAC,KAAK,GAAG,KAAK,EAAC,GAAG,EAAE;QAC5D,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAE1C,MAAM,UAAU,GAAG,iDAAiD,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;QAC5F,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,UAAU,IAAI,WAAW,CAAA;QACpG,MAAM,KAAK,GAAG,OAAO;YACnB,CAAC,CAAC,gDAAgD,CAAC,CAAC,WAAW,CAAC;YAChE,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;QAExD,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAEzD,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAE9C,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC,CAAA;QAEjI,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAErC,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,EAAE,CAAA;QAC1C,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAA;QAEhE,yEAAyE;QACzE,sEAAsE;QACtE,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAEtD,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;QACnC,WAAW,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,CAAA;QAC/C,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAA;QACzC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAA;QACzC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAA;QACzC,WAAW,CAAC,KAAK,CAAC,EAAC,CAAC,UAAU,CAAC,EAAE,GAAG,EAAC,CAAC,CAAA;QAEtC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,CAAA;QAE5C,uDAAuD;QACvD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAE,CAAA;QAE9B,KAAK,MAAM,aAAa,IAAI,QAAQ,EAAE,CAAC;YACrC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,EAAE,aAAa,CAAC,CAAA;QAC1E,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YACjC,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAA;YAEvE,0EAA0E;YAC1E,mEAAmE;YACnE,IAAI,CAAC,aAAa;gBAAE,SAAQ;YAE5B,KAAK,MAAM,gBAAgB,IAAI,qBAAqB,EAAE,CAAC;gBACrD,MAAM,KAAK,GAAG,aAAa,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,CAAA;gBAE5E,KAAK,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAChE,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,iBAAiB,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAC;QACjE,IAAI,KAAK;YAAE,OAAO,IAAI,CAAA;QAEtB,KAAK,MAAM,gBAAgB,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAC,CAAC;gBAAE,OAAO,IAAI,CAAA;QACpI,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,sBAAsB,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,KAAK,EAAC;QACpF,MAAM,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAA;QAElE,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE;YAAE,OAAO,KAAK,CAAA;QAE9C,MAAM,gBAAgB,GAAG,UAAU,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAA;QAC5E,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,CAAA;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;QAEjF,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,eAAe,GAAG,gBAAgB,CAAC,YAAY,EAAE,CAAA;YAEvD,2EAA2E;YAC3E,gEAAgE;YAChE,IAAI,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC;gBAAE,OAAO,KAAK,CAAA;YAEtD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;YAErD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,KAAK,MAAM,aAAa,IAAI,QAAQ,EAAE,CAAC;oBACrC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC;wBAAE,OAAO,KAAK,CAAA;gBAC7D,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAA;QAE3D,IAAI,aAAa,IAAI,gBAAgB,EAAE,CAAC;YACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAC,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,EAAE,CAAC;oBACvH,OAAO,KAAK,CAAA;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,oBAAoB,CAAC,UAAU;QACpC,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAA;QAC9D,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;QAErD,OAAO,uEAAuE,CAAC,CAAC,UAAU,CAAC,CAAA;IAC7F,CAAC;CACF","sourcesContent":["// @ts-check\n\n/**\n * Preloads relationships onto already-loaded frontend model instances.\n *\n * Unlike the backend ORM preloader (which queries relationship tables\n * directly), the frontend re-fetches the parent records through their\n * `index` endpoint with the preload/select params, then copies the resulting\n * top-level preloaded relationships onto the existing instances. Relationships\n * that are already preloaded with the required columns present are skipped,\n * so repeated calls reuse the relationship cache instead of issuing duplicate\n * requests.\n */\nexport default class FrontendModelPreloader {\n  /**\n   * @param {Array<import(\"./base.js\").default>} models - Frontend model instances to preload onto.\n   * @param {import(\"./query.js\").default<any> | import(\"../database/query/index.js\").NestedPreloadRecord | string | Array<string | import(\"../database/query/index.js\").NestedPreloadRecord>} queryOrSpec - A query built via `Model.preload(...).select(...)`, or a raw preload spec.\n   * @param {{force?: boolean}} [options] - Options.\n   * @returns {Promise<void>} - Resolves when preloading completes.\n   */\n  static async preload(models, queryOrSpec, {force = false} = {}) {\n    if (!models || models.length === 0) return\n\n    const modelClass = /** @type {typeof import(\"./base.js\").default} */ (models[0].constructor)\n    const isQuery = Boolean(queryOrSpec) && typeof queryOrSpec === \"object\" && \"_preload\" in queryOrSpec\n    const query = isQuery\n      ? /** @type {import(\"./query.js\").default<any>} */ (queryOrSpec)\n      : modelClass.preload(/** @type {any} */ (queryOrSpec))\n\n    const topLevelRelationships = Object.keys(query._preload)\n\n    if (topLevelRelationships.length === 0) return\n\n    const modelsToLoad = models.filter((model) => this._modelNeedsReload({modelClass, model, preload: query._preload, query, force}))\n\n    if (modelsToLoad.length === 0) return\n\n    const primaryKey = modelClass.primaryKey()\n    const ids = modelsToLoad.map((model) => model.primaryKeyValue())\n\n    // Rebuild a fresh query carrying only the projection-relevant state so a\n    // user-supplied limit/sort/where on the source query doesn't leak in.\n    const reloadQuery = modelClass.preload(query._preload)\n\n    reloadQuery._select = query._select\n    reloadQuery._selectsExtra = query._selectsExtra\n    reloadQuery._withCount = query._withCount\n    reloadQuery._abilities = query._abilities\n    reloadQuery._queryData = query._queryData\n    reloadQuery.where({[primaryKey]: ids})\n\n    const reloaded = await reloadQuery.toArray()\n\n    /** @type {Map<string, import(\"./base.js\").default>} */\n    const reloadedById = new Map()\n\n    for (const reloadedModel of reloaded) {\n      reloadedById.set(String(reloadedModel.primaryKeyValue()), reloadedModel)\n    }\n\n    for (const model of modelsToLoad) {\n      const reloadedModel = reloadedById.get(String(model.primaryKeyValue()))\n\n      // The record may have been deleted/filtered between the original load and\n      // this preload — skip it rather than crashing on a missing reload.\n      if (!reloadedModel) continue\n\n      for (const relationshipName of topLevelRelationships) {\n        const value = reloadedModel.getRelationshipByName(relationshipName).loaded()\n\n        model.getRelationshipByName(relationshipName).setLoaded(value)\n      }\n    }\n  }\n\n  /**\n   * @param {object} args - Options object.\n   * @param {typeof import(\"./base.js\").default} args.modelClass - Model class the preload graph is rooted at.\n   * @param {import(\"./base.js\").default} args.model - Model instance.\n   * @param {import(\"../database/query/index.js\").NestedPreloadRecord} args.preload - Preload sub-graph to satisfy.\n   * @param {import(\"./query.js\").default<any>} args.query - Source query carrying select/selectsExtra.\n   * @param {boolean} args.force - Whether to reload regardless of cached state.\n   * @returns {boolean} - Whether the model needs a reload request.\n   */\n  static _modelNeedsReload({modelClass, model, preload, query, force}) {\n    if (force) return true\n\n    for (const relationshipName of Object.keys(preload)) {\n      if (!this._relationshipSatisfied({modelClass, model, relationshipName, subPreload: preload[relationshipName], query})) return true\n    }\n\n    return false\n  }\n\n  /**\n   * A relationship is satisfied when it is already preloaded, every required\n   * `select` attribute is present on each loaded target, and any nested preload\n   * sub-graph is recursively satisfied on those targets. `selectsExtra` can\n   * never be proven satisfied from the cache (the backend serializes the\n   * client-unknown default attributes plus the extras), so it always reloads.\n   * With no select and no nested preload, being preloaded is enough.\n   * @param {object} args - Options object.\n   * @param {typeof import(\"./base.js\").default} args.modelClass - Model class owning the relationship.\n   * @param {import(\"./base.js\").default} args.model - Model instance.\n   * @param {string} args.relationshipName - Relationship name.\n   * @param {import(\"../database/query/index.js\").NestedPreloadRecord[string]} args.subPreload - Preload value for this relationship (`true` or a nested record).\n   * @param {import(\"./query.js\").default<any>} args.query - Source query carrying select/selectsExtra.\n   * @returns {boolean} - Whether the relationship is already satisfied.\n   */\n  static _relationshipSatisfied({modelClass, model, relationshipName, subPreload, query}) {\n    const relationship = model.getRelationshipByName(relationshipName)\n\n    if (!relationship.getPreloaded()) return false\n\n    const targetModelClass = modelClass.relationshipModelClass(relationshipName)\n    const loaded = relationship.loaded()\n    const targets = loaded == null ? [] : (Array.isArray(loaded) ? loaded : [loaded])\n\n    if (targetModelClass) {\n      const targetModelName = targetModelClass.getModelName()\n\n      // `selectsExtra` serializes the default attributes (unknown to the client)\n      // plus the extras, so a cached target can't be proven complete.\n      if (query._selectsExtra[targetModelName]) return false\n\n      const required = query._select[targetModelName] || []\n\n      for (const target of targets) {\n        for (const attributeName of required) {\n          if (!target.hasLoadedAttribute(attributeName)) return false\n        }\n      }\n    }\n\n    const nestedPreload = this._nestedPreloadRecord(subPreload)\n\n    if (nestedPreload && targetModelClass) {\n      for (const target of targets) {\n        if (this._modelNeedsReload({modelClass: targetModelClass, model: target, preload: nestedPreload, query, force: false})) {\n          return false\n        }\n      }\n    }\n\n    return true\n  }\n\n  /**\n   * @param {import(\"../database/query/index.js\").NestedPreloadRecord[string]} subPreload - Preload value for a relationship.\n   * @returns {import(\"../database/query/index.js\").NestedPreloadRecord | null} - Nested preload record, or null when there is no deeper graph.\n   */\n  static _nestedPreloadRecord(subPreload) {\n    if (!subPreload || typeof subPreload !== \"object\") return null\n    if (Object.keys(subPreload).length === 0) return null\n\n    return /** @type {import(\"../database/query/index.js\").NestedPreloadRecord} */ (subPreload)\n  }\n}\n"]}
|
|
@@ -28,7 +28,10 @@ export default class FrontendModelQuery<T extends typeof import("./base.js").def
|
|
|
28
28
|
_preload: import("../database/query/index.js").NestedPreloadRecord;
|
|
29
29
|
_joins: {};
|
|
30
30
|
_where: {};
|
|
31
|
-
|
|
31
|
+
/** @type {Record<string, string[]>} */
|
|
32
|
+
_select: Record<string, string[]>;
|
|
33
|
+
/** @type {Record<string, string[]>} */
|
|
34
|
+
_selectsExtra: Record<string, string[]>;
|
|
32
35
|
_distinct: boolean;
|
|
33
36
|
_limit: number | null;
|
|
34
37
|
_offset: number | null;
|
|
@@ -152,6 +155,14 @@ export default class FrontendModelQuery<T extends typeof import("./base.js").def
|
|
|
152
155
|
* @returns {this} - Query with merged selected attributes.
|
|
153
156
|
*/
|
|
154
157
|
select(select: Record<string, string[] | string> | string | string[]): this;
|
|
158
|
+
/**
|
|
159
|
+
* Like `select(...)`, but keeps the default serialized attributes and loads
|
|
160
|
+
* the given extras in addition (for example attributes declared
|
|
161
|
+
* `selectedByDefault: false`). Keyed by model name, with root-model shorthand.
|
|
162
|
+
* @param {Record<string, string[] | string> | string | string[]} select - Extra attributes to load, keyed by model name or root-model shorthand.
|
|
163
|
+
* @returns {this} - Query with merged extra selected attributes.
|
|
164
|
+
*/
|
|
165
|
+
selectsExtra(select: Record<string, string[] | string> | string | string[]): this;
|
|
155
166
|
/**
|
|
156
167
|
* @param {Record<string, any> | Array<Record<string, any>>} joins - Relationship descriptor joins.
|
|
157
168
|
* @returns {this} - Query with merged joins.
|
|
@@ -232,6 +243,10 @@ export default class FrontendModelQuery<T extends typeof import("./base.js").def
|
|
|
232
243
|
* @returns {Record<string, any>} - Payload select hash when present.
|
|
233
244
|
*/
|
|
234
245
|
selectPayload(requiredAttributes?: string[]): Record<string, any>;
|
|
246
|
+
/**
|
|
247
|
+
* @returns {Record<string, any>} - Payload selectsExtra hash when present.
|
|
248
|
+
*/
|
|
249
|
+
selectsExtraPayload(): Record<string, any>;
|
|
235
250
|
/**
|
|
236
251
|
* @returns {Record<string, any>} - Payload searches array when present.
|
|
237
252
|
*/
|
|
@@ -350,6 +365,10 @@ export type FrontendModelProjectionOptions = {
|
|
|
350
365
|
* - Model-aware attribute select map or root-model shorthand.
|
|
351
366
|
*/
|
|
352
367
|
select?: string | string[] | Record<string, string | string[]> | undefined;
|
|
368
|
+
/**
|
|
369
|
+
* - Extra attributes to load in addition to the defaults, keyed by model name or root-model shorthand.
|
|
370
|
+
*/
|
|
371
|
+
selectsExtra?: string | string[] | Record<string, string | string[]> | undefined;
|
|
353
372
|
/**
|
|
354
373
|
* - Relationship preload tree.
|
|
355
374
|
*/
|
|
@@ -375,6 +394,10 @@ export type FrontendModelProjectionPayload = {
|
|
|
375
394
|
* - Normalized select map.
|
|
376
395
|
*/
|
|
377
396
|
select?: Record<string, string[]> | undefined;
|
|
397
|
+
/**
|
|
398
|
+
* - Normalized extra select map.
|
|
399
|
+
*/
|
|
400
|
+
selectsExtra?: Record<string, string[]> | undefined;
|
|
378
401
|
/**
|
|
379
402
|
* - Normalized preload tree.
|
|
380
403
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/frontend-models/query.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/frontend-models/query.js"],"names":[],"mappings":"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"}
|