jcc-express-mvc 1.7.2 → 1.7.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.
- package/lib/Jcc-eloquent/lib/Builder.d.ts +4 -0
- package/lib/Jcc-eloquent/lib/Builder.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/Builder.js +51 -20
- package/lib/Jcc-eloquent/lib/Cast/index.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/Cast/index.js +10 -5
- package/lib/Jcc-eloquent/lib/Model.d.ts +1 -14
- package/lib/Jcc-eloquent/lib/Model.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/Model.js +0 -60
- package/lib/Jcc-eloquent/lib/QueryBuilder.d.ts +10 -0
- package/lib/Jcc-eloquent/lib/QueryBuilder.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/QueryBuilder.js +16 -3
- package/package.json +1 -1
|
@@ -14,6 +14,7 @@ export declare class Builder {
|
|
|
14
14
|
onlyTrashed(): this;
|
|
15
15
|
with(relations: string | string[]): this;
|
|
16
16
|
setModel(model: typeof Model): this;
|
|
17
|
+
newModelInstance(data: Record<string, any>): Model | undefined;
|
|
17
18
|
has(relation: string, operator?: string, count?: number, boolean?: "and" | "or", callback?: (q: Builder) => void): this;
|
|
18
19
|
whereHas(relation: string, callback?: (q: Builder) => void, operator?: string, count?: number): this;
|
|
19
20
|
orWhereHas(relation: string, callback?: (q: Builder) => void, operator?: string, count?: number): this;
|
|
@@ -171,6 +172,9 @@ export declare class Builder {
|
|
|
171
172
|
private applyColumn;
|
|
172
173
|
private applyAggregate;
|
|
173
174
|
private applyUnion;
|
|
175
|
+
private applyUpdate;
|
|
176
|
+
private fireUpdating;
|
|
177
|
+
private fireUpdated;
|
|
174
178
|
private reset;
|
|
175
179
|
}
|
|
176
180
|
//# sourceMappingURL=Builder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/Builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EACL,cAAc,EACd,YAAY,EAGZ,eAAe,EACf,UAAU,EACX,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/Builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Builder = void 0;
|
|
4
4
|
const Database_1 = require("./Database");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
|
+
const ModelEvent_1 = require("./Event/ModelEvent");
|
|
6
7
|
class Builder {
|
|
7
8
|
constructor() {
|
|
8
9
|
this.tableName = "";
|
|
@@ -22,11 +23,8 @@ class Builder {
|
|
|
22
23
|
return this;
|
|
23
24
|
}
|
|
24
25
|
with(relations) {
|
|
25
|
-
if (
|
|
26
|
-
this.eagerLoad = [relations];
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
this.eagerLoad = relations;
|
|
26
|
+
if (this.model) {
|
|
27
|
+
this.model.eagerLoad = Array.isArray(relations) ? relations : [relations];
|
|
30
28
|
}
|
|
31
29
|
return this;
|
|
32
30
|
}
|
|
@@ -34,6 +32,11 @@ class Builder {
|
|
|
34
32
|
this.model = model;
|
|
35
33
|
return this;
|
|
36
34
|
}
|
|
35
|
+
newModelInstance(data) {
|
|
36
|
+
if (this.model) {
|
|
37
|
+
return new this.model(data);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
37
40
|
has(relation, operator = ">=", count = 1, boolean = "and", callback) {
|
|
38
41
|
if (!this.model) {
|
|
39
42
|
throw new Error("Model not set for builder");
|
|
@@ -435,15 +438,21 @@ class Builder {
|
|
|
435
438
|
return this;
|
|
436
439
|
}
|
|
437
440
|
async get() {
|
|
438
|
-
const result = this.getQueryBuilder()
|
|
439
|
-
console.log(result.toSQL());
|
|
441
|
+
const result = await this.getQueryBuilder();
|
|
440
442
|
this.reset();
|
|
443
|
+
if (this.model) {
|
|
444
|
+
const hydrated = await this.model.hydrate(result);
|
|
445
|
+
return Array.isArray(hydrated) ? hydrated : hydrated ? [hydrated] : [];
|
|
446
|
+
}
|
|
441
447
|
return result;
|
|
442
448
|
}
|
|
443
449
|
async first() {
|
|
444
|
-
const result = await this.
|
|
450
|
+
const result = await this.getQueryBuilder().first();
|
|
451
|
+
if (this.model) {
|
|
452
|
+
return this.model.hydrate(result);
|
|
453
|
+
}
|
|
445
454
|
this.reset();
|
|
446
|
-
return result
|
|
455
|
+
return result ? result : null;
|
|
447
456
|
}
|
|
448
457
|
clone() {
|
|
449
458
|
const clone = new Builder();
|
|
@@ -461,7 +470,6 @@ class Builder {
|
|
|
461
470
|
async exists() {
|
|
462
471
|
const result = await this.first();
|
|
463
472
|
this.reset();
|
|
464
|
-
console.log({ result });
|
|
465
473
|
return !!result;
|
|
466
474
|
}
|
|
467
475
|
/**
|
|
@@ -483,16 +491,9 @@ class Builder {
|
|
|
483
491
|
return result && Array.isArray(result) ? result[0] : result;
|
|
484
492
|
}
|
|
485
493
|
async update(data) {
|
|
486
|
-
let
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
result = await this.updateJson(key, data[key]);
|
|
490
|
-
delete data[key];
|
|
491
|
-
}
|
|
492
|
-
}
|
|
493
|
-
if (Object.keys(data).length > 0) {
|
|
494
|
-
result = await this.getQueryBuilder().update(data);
|
|
495
|
-
}
|
|
494
|
+
let newData = await this.fireUpdating(data);
|
|
495
|
+
const result = await this.applyUpdate(newData);
|
|
496
|
+
await this.fireUpdated(newData);
|
|
496
497
|
this.reset();
|
|
497
498
|
return result ? true : false;
|
|
498
499
|
}
|
|
@@ -743,6 +744,36 @@ class Builder {
|
|
|
743
744
|
}
|
|
744
745
|
return this;
|
|
745
746
|
}
|
|
747
|
+
async applyUpdate(data) {
|
|
748
|
+
let result = false;
|
|
749
|
+
for (const key in data) {
|
|
750
|
+
if (key.includes(".")) {
|
|
751
|
+
result = await this.updateJson(key, data[key]);
|
|
752
|
+
delete data[key];
|
|
753
|
+
}
|
|
754
|
+
}
|
|
755
|
+
if (Object.keys(data).length > 0) {
|
|
756
|
+
result = await this.getQueryBuilder().update(data);
|
|
757
|
+
}
|
|
758
|
+
return result;
|
|
759
|
+
}
|
|
760
|
+
async fireUpdating(data) {
|
|
761
|
+
if (this.model) {
|
|
762
|
+
const instance = this.newModelInstance(data);
|
|
763
|
+
await ModelEvent_1.ModelEvent.fireEvent(this.model, "updating", instance);
|
|
764
|
+
if (instance.timestamps) {
|
|
765
|
+
instance.exists = true;
|
|
766
|
+
instance.setAttribute("updated_at", new Date());
|
|
767
|
+
}
|
|
768
|
+
return instance._attributes;
|
|
769
|
+
}
|
|
770
|
+
return data;
|
|
771
|
+
}
|
|
772
|
+
async fireUpdated(data) {
|
|
773
|
+
if (this.model) {
|
|
774
|
+
await ModelEvent_1.ModelEvent.fireEvent(this.model, "updating", (await this.model.hydrate(data)) || data);
|
|
775
|
+
}
|
|
776
|
+
}
|
|
746
777
|
reset() {
|
|
747
778
|
this.queryBuilder = null;
|
|
748
779
|
// this.tableName = "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../Framework/lib/Jcc-eloquent/lib/Cast/index.ts"],"names":[],"mappings":"AAoBA,qBAAa,IAAI;WACD,WAAW,CACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAc5B,OAAO,CAAC,MAAM,CAAC,QAAQ;IAqDvB,OAAO,CAAC,MAAM,CAAC,MAAM;IAIrB,OAAO,CAAC,MAAM,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../Framework/lib/Jcc-eloquent/lib/Cast/index.ts"],"names":[],"mappings":"AAoBA,qBAAa,IAAI;WACD,WAAW,CACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAc5B,OAAO,CAAC,MAAM,CAAC,QAAQ;IAqDvB,OAAO,CAAC,MAAM,CAAC,MAAM;IAIrB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAQvB,OAAO,CAAC,MAAM,CAAC,KAAK;IAWpB,OAAO,CAAC,MAAM,CAAC,OAAO;IAItB,OAAO,CAAC,MAAM,CAAC,OAAO;IAItB,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAU7B;CACH"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Cast = void 0;
|
|
4
|
-
const Date_1 = require("
|
|
4
|
+
const Date_1 = require("../../../Date");
|
|
5
5
|
const DatabaseError_1 = require("../Error/DatabaseError");
|
|
6
6
|
const constant_1 = require("../Error/constant");
|
|
7
7
|
const types_1 = require("./types");
|
|
@@ -43,13 +43,13 @@ class Cast {
|
|
|
43
43
|
: query[key];
|
|
44
44
|
}
|
|
45
45
|
if (query.hasOwnProperty("id") && actionType === types_1.DATETIME) {
|
|
46
|
-
return (query[key] = this.dateTime(query[key], "
|
|
46
|
+
return (query[key] = this.dateTime(query[key], "yyyy-MM-dd HH:mm:ss"));
|
|
47
47
|
}
|
|
48
48
|
if (query.hasOwnProperty("id") && actionType === types_1.DATE) {
|
|
49
|
-
return (query[key] = this.dateTime(query[key], "
|
|
49
|
+
return (query[key] = this.dateTime(query[key], "yyyy-MM-dd"));
|
|
50
50
|
}
|
|
51
51
|
if (query.hasOwnProperty("id") && actionType === types_1.TIME) {
|
|
52
|
-
return (query[key] = this.dateTime(query[key], "
|
|
52
|
+
return (query[key] = this.dateTime(query[key], "HH:mm:ss"));
|
|
53
53
|
}
|
|
54
54
|
if (query.hasOwnProperty("id") && actionType === types_1.NOW) {
|
|
55
55
|
return (query[key] = this.dateTime(query[key], types_1.NOW));
|
|
@@ -63,7 +63,12 @@ class Cast {
|
|
|
63
63
|
return value.toString() || "";
|
|
64
64
|
}
|
|
65
65
|
static dateTime(value, format) {
|
|
66
|
-
|
|
66
|
+
if (!value)
|
|
67
|
+
return "";
|
|
68
|
+
if (format === types_1.NOW) {
|
|
69
|
+
return new Date_1.Carbon(value).diffForHumans();
|
|
70
|
+
}
|
|
71
|
+
return new Date_1.Carbon(value).format(format);
|
|
67
72
|
}
|
|
68
73
|
static array(data) {
|
|
69
74
|
if (typeof data === "string") {
|
|
@@ -4,17 +4,13 @@ import { HasOne, HasMany, BelongsTo, BelongsToMany, MorphTo, MorphOne, MorphMany
|
|
|
4
4
|
import { Request } from "express";
|
|
5
5
|
import { Pagination } from "./Interfaces";
|
|
6
6
|
export declare class Model extends BaseModel {
|
|
7
|
-
|
|
7
|
+
static eagerLoad: string[];
|
|
8
8
|
relations: Record<string, any>;
|
|
9
9
|
constructor(attributes?: Record<string, any>);
|
|
10
10
|
getTable(): string;
|
|
11
11
|
getKeyName(): string;
|
|
12
12
|
getKey(): any;
|
|
13
13
|
static paginate(request: Request, perPage?: number | string): Promise<Pagination>;
|
|
14
|
-
/**
|
|
15
|
-
* Fetch the first record from the database table.
|
|
16
|
-
*/
|
|
17
|
-
static first(): Promise<Model | null>;
|
|
18
14
|
/**
|
|
19
15
|
* Creates a records in the database.
|
|
20
16
|
*/
|
|
@@ -27,18 +23,9 @@ export declare class Model extends BaseModel {
|
|
|
27
23
|
* Delete records.
|
|
28
24
|
*/
|
|
29
25
|
static delete(id?: string | number): Promise<any>;
|
|
30
|
-
/**
|
|
31
|
-
* Retrieves all records, including soft-deleted ones.
|
|
32
|
-
*/
|
|
33
|
-
/**
|
|
34
|
-
* Retrieves all records, including soft-deleted ones.
|
|
35
|
-
*/
|
|
36
|
-
static withTrashed(): Builder;
|
|
37
|
-
static onlyTrashed(): Builder;
|
|
38
26
|
/**
|
|
39
27
|
* Executes the query and loads specified relations.
|
|
40
28
|
*/
|
|
41
|
-
static get(): Promise<Model[]>;
|
|
42
29
|
static find(id: string | number): Promise<Model | null>;
|
|
43
30
|
static all(): Promise<Model[]>;
|
|
44
31
|
static hydrate(items: any | any[]): Promise<Model | Model[] | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/Model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,MAAM,EACN,OAAO,EACP,SAAS,EACT,aAAa,EACb,OAAO,EACP,QAAQ,EACR,SAAS,EACV,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qBAAa,KAAM,SAAQ,SAAS;IAClC,
|
|
1
|
+
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/Model.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,15 +56,6 @@ class Model extends BaseModel_1.BaseModel {
|
|
|
56
56
|
},
|
|
57
57
|
};
|
|
58
58
|
}
|
|
59
|
-
/**
|
|
60
|
-
* Fetch the first record from the database table.
|
|
61
|
-
*/
|
|
62
|
-
static async first() {
|
|
63
|
-
// const query = this.query().from(this.getTable());
|
|
64
|
-
const result = await this.query().first();
|
|
65
|
-
const hydrated = await this.hydrate(result);
|
|
66
|
-
return hydrated instanceof Model ? hydrated : null;
|
|
67
|
-
}
|
|
68
59
|
/**
|
|
69
60
|
* Creates a records in the database.
|
|
70
61
|
*/
|
|
@@ -106,29 +97,9 @@ class Model extends BaseModel_1.BaseModel {
|
|
|
106
97
|
}
|
|
107
98
|
return query.delete();
|
|
108
99
|
}
|
|
109
|
-
/**
|
|
110
|
-
* Retrieves all records, including soft-deleted ones.
|
|
111
|
-
*/
|
|
112
|
-
/**
|
|
113
|
-
* Retrieves all records, including soft-deleted ones.
|
|
114
|
-
*/
|
|
115
|
-
static withTrashed() {
|
|
116
|
-
return this.query().withTrashed();
|
|
117
|
-
}
|
|
118
|
-
static onlyTrashed() {
|
|
119
|
-
return this.query().onlyTrashed();
|
|
120
|
-
}
|
|
121
100
|
/**
|
|
122
101
|
* Executes the query and loads specified relations.
|
|
123
102
|
*/
|
|
124
|
-
static async get() {
|
|
125
|
-
if (this.softDelete) {
|
|
126
|
-
this.whereNull("deleted_at");
|
|
127
|
-
}
|
|
128
|
-
const results = await this.query().get();
|
|
129
|
-
const hydrated = await this.hydrate(results);
|
|
130
|
-
return Array.isArray(hydrated) ? hydrated : [];
|
|
131
|
-
}
|
|
132
103
|
static async find(id) {
|
|
133
104
|
const result = await this.query().where("id", id).first();
|
|
134
105
|
if (!result)
|
|
@@ -141,41 +112,10 @@ class Model extends BaseModel_1.BaseModel {
|
|
|
141
112
|
const hydrated = await this.hydrate(results);
|
|
142
113
|
return Array.isArray(hydrated) ? hydrated : [];
|
|
143
114
|
}
|
|
144
|
-
// public static async hydrate(
|
|
145
|
-
// items: any | any[]
|
|
146
|
-
// ): Promise<Model | Model[] | null> {
|
|
147
|
-
// if (!items) return null;
|
|
148
|
-
// const hydrateItem = async (item: any) => {
|
|
149
|
-
// const model = new this(item);
|
|
150
|
-
// model.exists = true;
|
|
151
|
-
// model.syncOriginal();
|
|
152
|
-
// // Load relationships if they were eager loaded
|
|
153
|
-
// if (this.eagerLoad?.length) {
|
|
154
|
-
// await EagerLoader.load(model, this.eagerLoad);
|
|
155
|
-
// }
|
|
156
|
-
// return model;
|
|
157
|
-
// };
|
|
158
|
-
// if (Array.isArray(items)) {
|
|
159
|
-
// const models = await Promise.all(items.map(hydrateItem));
|
|
160
|
-
// // Optimize: load relations for all models at once
|
|
161
|
-
// if (this.eagerLoad?.length && models.length > 0) {
|
|
162
|
-
// await EagerLoader.load(models, this.eagerLoad);
|
|
163
|
-
// // Remove the individual loads that already happened
|
|
164
|
-
// return models;
|
|
165
|
-
// }
|
|
166
|
-
// return models;
|
|
167
|
-
// } else {
|
|
168
|
-
// return hydrateItem(items);
|
|
169
|
-
// }
|
|
170
|
-
// }
|
|
171
|
-
// -----------------
|
|
172
|
-
// Saving
|
|
173
|
-
// -----------------
|
|
174
115
|
static async hydrate(items) {
|
|
175
116
|
if (!items)
|
|
176
117
|
return null;
|
|
177
118
|
if (Array.isArray(items)) {
|
|
178
|
-
// First hydrate all items without loading relations
|
|
179
119
|
const hydrateWithoutRelations = async (item) => {
|
|
180
120
|
const model = new this(item);
|
|
181
121
|
model.exists = true;
|
|
@@ -4,10 +4,12 @@ import { Knex } from "knex";
|
|
|
4
4
|
import { AggregateInput, JoinCallback, SubJoinCallback, WhereInput } from "./Types";
|
|
5
5
|
import { Request } from "express";
|
|
6
6
|
export declare class QueryBuilder extends ModelEvent {
|
|
7
|
+
protected data?: Record<string, any> | undefined;
|
|
7
8
|
protected static table: string;
|
|
8
9
|
protected static softDelete: boolean;
|
|
9
10
|
protected static eagerLoad: string[];
|
|
10
11
|
relations: Record<string, any>;
|
|
12
|
+
constructor(data?: Record<string, any> | undefined);
|
|
11
13
|
static getTable(): string;
|
|
12
14
|
/**
|
|
13
15
|
* Return a query builder instance for the model's table.
|
|
@@ -336,6 +338,14 @@ export declare class QueryBuilder extends ModelEvent {
|
|
|
336
338
|
* Load the specified relations for the model.
|
|
337
339
|
*/
|
|
338
340
|
load(relations: string[]): Promise<this>;
|
|
341
|
+
/**
|
|
342
|
+
* Retrieves all records, including soft-deleted ones.
|
|
343
|
+
*/
|
|
344
|
+
/**
|
|
345
|
+
* Retrieves all records, including soft-deleted ones.
|
|
346
|
+
*/
|
|
347
|
+
static withTrashed(): Builder;
|
|
348
|
+
static onlyTrashed(): Builder;
|
|
339
349
|
static paginate(req: Request, perPage?: number | string): Promise<any>;
|
|
340
350
|
}
|
|
341
351
|
//# sourceMappingURL=QueryBuilder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/QueryBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EACL,cAAc,EACd,YAAY,EACZ,eAAe,EACf,UAAU,EACX,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/QueryBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,9 @@ const utils_1 = require("./utils");
|
|
|
5
5
|
const Builder_1 = require("./Builder");
|
|
6
6
|
const ModelEvent_1 = require("./Event/ModelEvent");
|
|
7
7
|
class QueryBuilder extends ModelEvent_1.ModelEvent {
|
|
8
|
-
constructor() {
|
|
9
|
-
super(
|
|
8
|
+
constructor(data) {
|
|
9
|
+
super();
|
|
10
|
+
this.data = data;
|
|
10
11
|
this.relations = {};
|
|
11
12
|
}
|
|
12
13
|
static getTable() {
|
|
@@ -502,7 +503,7 @@ class QueryBuilder extends ModelEvent_1.ModelEvent {
|
|
|
502
503
|
static with(relations) {
|
|
503
504
|
// this.eagerLoad = Array.isArray(relations) ? relations : [relations];
|
|
504
505
|
// return this;
|
|
505
|
-
return this.query(); // Placeholder, implementation commented out in original
|
|
506
|
+
return this.query().with(relations); // Placeholder, implementation commented out in original
|
|
506
507
|
}
|
|
507
508
|
/**
|
|
508
509
|
* Get the eager loaded relations.
|
|
@@ -522,6 +523,18 @@ class QueryBuilder extends ModelEvent_1.ModelEvent {
|
|
|
522
523
|
}
|
|
523
524
|
return this;
|
|
524
525
|
}
|
|
526
|
+
/**
|
|
527
|
+
* Retrieves all records, including soft-deleted ones.
|
|
528
|
+
*/
|
|
529
|
+
/**
|
|
530
|
+
* Retrieves all records, including soft-deleted ones.
|
|
531
|
+
*/
|
|
532
|
+
static withTrashed() {
|
|
533
|
+
return this.query().withTrashed();
|
|
534
|
+
}
|
|
535
|
+
static onlyTrashed() {
|
|
536
|
+
return this.query().onlyTrashed();
|
|
537
|
+
}
|
|
525
538
|
static async paginate(req, perPage = 15) { }
|
|
526
539
|
}
|
|
527
540
|
exports.QueryBuilder = QueryBuilder;
|