objection 3.1.2 → 3.1.3
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.
|
@@ -76,8 +76,8 @@ class ReferenceBuilder {
|
|
|
76
76
|
const table = this.tableName
|
|
77
77
|
? this.tableName
|
|
78
78
|
: this.modelClass
|
|
79
|
-
|
|
80
|
-
|
|
79
|
+
? builder.tableRefFor(this.modelClass)
|
|
80
|
+
: null;
|
|
81
81
|
|
|
82
82
|
if (table) {
|
|
83
83
|
return `${table}.${this.column}`;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "objection",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.3",
|
|
4
4
|
"description": "An SQL-friendly ORM for Node.js",
|
|
5
5
|
"main": "lib/objection.js",
|
|
6
6
|
"license": "MIT",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
],
|
|
54
54
|
"types": "./typings/objection/index.d.ts",
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"ajv": "^8.
|
|
56
|
+
"ajv": "^8.12.0",
|
|
57
57
|
"ajv-formats": "^2.1.1",
|
|
58
58
|
"db-errors": "^0.2.3"
|
|
59
59
|
},
|
|
@@ -61,20 +61,20 @@
|
|
|
61
61
|
"knex": ">=1.0.1"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
|
-
"@types/node": "^20.
|
|
65
|
-
"chai": "^4.3.
|
|
64
|
+
"@types/node": "^20.10.0",
|
|
65
|
+
"chai": "^4.3.10",
|
|
66
66
|
"chai-subset": "^1.6.0",
|
|
67
|
-
"eslint": "^8.
|
|
67
|
+
"eslint": "^8.54.0",
|
|
68
68
|
"eslint-formatter-codeframe": "^7.32.1",
|
|
69
|
-
"eslint-plugin-prettier": "^5.0.
|
|
69
|
+
"eslint-plugin-prettier": "^5.0.1",
|
|
70
70
|
"expect.js": "^0.3.1",
|
|
71
|
-
"knex": "
|
|
71
|
+
"knex": "^3.0.1",
|
|
72
72
|
"mocha": "^10.2.0",
|
|
73
73
|
"mysql": "^2.18.1",
|
|
74
|
-
"pg": "^8.
|
|
75
|
-
"prettier": "3.0
|
|
76
|
-
"sqlite3": "^5.
|
|
77
|
-
"typescript": ">=
|
|
74
|
+
"pg": "^8.11.3",
|
|
75
|
+
"prettier": "3.1.0",
|
|
76
|
+
"sqlite3": "^5.1.6",
|
|
77
|
+
"typescript": ">=5.3.2",
|
|
78
78
|
"vuepress": "1.9.10"
|
|
79
79
|
}
|
|
80
80
|
}
|
|
@@ -203,10 +203,10 @@ declare namespace Objection {
|
|
|
203
203
|
[K in DataPropertyNames<T>]?: Defined<T[K]> extends Model
|
|
204
204
|
? T[K]
|
|
205
205
|
: Defined<T[K]> extends Array<infer I>
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
206
|
+
? I extends Model
|
|
207
|
+
? I[]
|
|
208
|
+
: Expression<T[K]>
|
|
209
|
+
: Expression<T[K]>;
|
|
210
210
|
};
|
|
211
211
|
|
|
212
212
|
/**
|
|
@@ -232,10 +232,10 @@ declare namespace Objection {
|
|
|
232
232
|
type PartialModelGraphField<F> = Defined<F> extends Model
|
|
233
233
|
? PartialModelGraph<Defined<F>>
|
|
234
234
|
: Defined<F> extends Array<infer I>
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
235
|
+
? I extends Model
|
|
236
|
+
? PartialModelGraph<I>[]
|
|
237
|
+
: Expression<F>
|
|
238
|
+
: Expression<F>;
|
|
239
239
|
|
|
240
240
|
/**
|
|
241
241
|
* Extracts the property names (excluding relations) of a model class.
|
|
@@ -245,12 +245,12 @@ declare namespace Objection {
|
|
|
245
245
|
[K in keyof T]?: Defined<T[K]> extends Model
|
|
246
246
|
? never
|
|
247
247
|
: Defined<T[K]> extends Array<infer I>
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
248
|
+
? I extends Model
|
|
249
|
+
? never
|
|
250
|
+
: K
|
|
251
|
+
: T[K] extends Function
|
|
252
|
+
? never
|
|
253
|
+
: K;
|
|
254
254
|
}[keyof T],
|
|
255
255
|
undefined | 'QueryBuilderType'
|
|
256
256
|
>;
|
|
@@ -263,10 +263,10 @@ declare namespace Objection {
|
|
|
263
263
|
[K in keyof T]?: Defined<T[K]> extends Model
|
|
264
264
|
? K
|
|
265
265
|
: Defined<T[K]> extends Array<infer I>
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
266
|
+
? I extends Model
|
|
267
|
+
? K
|
|
268
|
+
: never
|
|
269
|
+
: never;
|
|
270
270
|
}[keyof T]
|
|
271
271
|
>;
|
|
272
272
|
|
|
@@ -277,10 +277,10 @@ declare namespace Objection {
|
|
|
277
277
|
type RelatedQueryBuilder<T> = T extends Model
|
|
278
278
|
? SingleQueryBuilder<QueryBuilderType<T>>
|
|
279
279
|
: T extends Array<infer I>
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
280
|
+
? I extends Model
|
|
281
|
+
? QueryBuilderType<I>
|
|
282
|
+
: never
|
|
283
|
+
: never;
|
|
284
284
|
|
|
285
285
|
/**
|
|
286
286
|
* Just like RelatedQueryBuilder but always returns an array
|
|
@@ -290,10 +290,10 @@ declare namespace Objection {
|
|
|
290
290
|
type ArrayRelatedQueryBuilder<T> = T extends Model
|
|
291
291
|
? QueryBuilderType<T>
|
|
292
292
|
: T extends Array<infer I>
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
293
|
+
? I extends Model
|
|
294
|
+
? QueryBuilderType<I>
|
|
295
|
+
: never
|
|
296
|
+
: never;
|
|
297
297
|
|
|
298
298
|
/**
|
|
299
299
|
* Gets the query builder type for a model type.
|
|
@@ -1418,9 +1418,9 @@ declare namespace Objection {
|
|
|
1418
1418
|
table?: string;
|
|
1419
1419
|
}
|
|
1420
1420
|
|
|
1421
|
-
export
|
|
1422
|
-
|
|
1423
|
-
|
|
1421
|
+
export interface Constructor<T> {
|
|
1422
|
+
new (): T;
|
|
1423
|
+
}
|
|
1424
1424
|
|
|
1425
1425
|
export interface ModelConstructor<M extends Model> extends Constructor<M> {}
|
|
1426
1426
|
|