@abedmurrar/objection 4.0.0-alpha.0 → 4.0.0-beta.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.
Files changed (192) hide show
  1. package/README.md +103 -67
  2. package/lib/index.mjs +6 -0
  3. package/lib/initialize.js +6 -9
  4. package/lib/model/AjvValidator.js +235 -282
  5. package/lib/model/Model.js +653 -823
  6. package/lib/model/ModifierNotFoundError.js +5 -7
  7. package/lib/model/NotFoundError.js +14 -18
  8. package/lib/model/RelationDoesNotExistError.js +6 -9
  9. package/lib/model/ValidationError.js +33 -41
  10. package/lib/model/Validator.js +15 -21
  11. package/lib/model/getModel.js +1 -3
  12. package/lib/model/graph/ModelGraph.js +44 -64
  13. package/lib/model/graph/ModelGraphBuilder.js +164 -217
  14. package/lib/model/graph/ModelGraphEdge.js +31 -43
  15. package/lib/model/graph/ModelGraphNode.js +192 -231
  16. package/lib/model/inheritModel.js +9 -18
  17. package/lib/model/modelBindKnex.js +48 -62
  18. package/lib/model/modelClone.js +79 -98
  19. package/lib/model/modelColPropMap.js +16 -26
  20. package/lib/model/modelConcurrency.js +24 -0
  21. package/lib/model/modelId.js +44 -49
  22. package/lib/model/modelJsonAttributes.js +56 -76
  23. package/lib/model/modelParseRelations.js +68 -67
  24. package/lib/model/modelQueryProps.js +76 -107
  25. package/lib/model/modelSet.js +92 -112
  26. package/lib/model/modelTableMetadata.js +60 -72
  27. package/lib/model/modelToJson.js +120 -150
  28. package/lib/model/modelUtils.js +30 -37
  29. package/lib/model/modelValidate.js +34 -42
  30. package/lib/model/modelValues.js +78 -91
  31. package/lib/model/modelVisitor.js +22 -29
  32. package/lib/objection.js +42 -67
  33. package/lib/queryBuilder/FunctionBuilder.js +231 -279
  34. package/lib/queryBuilder/InternalOptions.js +19 -24
  35. package/lib/queryBuilder/JoinBuilder.js +116 -149
  36. package/lib/queryBuilder/QueryBuilder.js +1009 -1271
  37. package/lib/queryBuilder/QueryBuilderBase.js +647 -865
  38. package/lib/queryBuilder/QueryBuilderContext.js +14 -21
  39. package/lib/queryBuilder/QueryBuilderContextBase.js +20 -29
  40. package/lib/queryBuilder/QueryBuilderOperationSupport.js +462 -536
  41. package/lib/queryBuilder/QueryBuilderUserContext.js +19 -25
  42. package/lib/queryBuilder/RawBuilder.js +58 -73
  43. package/lib/queryBuilder/ReferenceBuilder.js +232 -270
  44. package/lib/queryBuilder/RelationExpression.js +322 -380
  45. package/lib/queryBuilder/StaticHookArguments.js +94 -106
  46. package/lib/queryBuilder/ValueBuilder.js +100 -112
  47. package/lib/queryBuilder/expressions.js +86 -116
  48. package/lib/queryBuilder/functions/mysql.js +642 -697
  49. package/lib/queryBuilder/graph/GraphAction.js +44 -59
  50. package/lib/queryBuilder/graph/GraphData.js +7 -9
  51. package/lib/queryBuilder/graph/GraphFetcher.js +115 -151
  52. package/lib/queryBuilder/graph/GraphNodeDbExistence.js +114 -152
  53. package/lib/queryBuilder/graph/GraphOperation.js +16 -22
  54. package/lib/queryBuilder/graph/GraphOptions.js +143 -185
  55. package/lib/queryBuilder/graph/GraphUpsert.js +167 -241
  56. package/lib/queryBuilder/graph/delete/GraphDelete.js +8 -13
  57. package/lib/queryBuilder/graph/delete/GraphDeleteAction.js +44 -62
  58. package/lib/queryBuilder/graph/insert/GraphInsert.js +99 -128
  59. package/lib/queryBuilder/graph/insert/GraphInsertAction.js +151 -193
  60. package/lib/queryBuilder/graph/insert/JoinRowGraphInsertAction.js +57 -79
  61. package/lib/queryBuilder/graph/patch/GraphPatch.js +8 -13
  62. package/lib/queryBuilder/graph/patch/GraphPatchAction.js +181 -234
  63. package/lib/queryBuilder/graph/recursiveUpsert/GraphRecursiveUpsert.js +16 -21
  64. package/lib/queryBuilder/graph/recursiveUpsert/GraphRecursiveUpsertAction.js +80 -110
  65. package/lib/queryBuilder/join/JoinResultColumn.js +14 -18
  66. package/lib/queryBuilder/join/JoinResultParser.js +88 -101
  67. package/lib/queryBuilder/join/RelationJoiner.js +205 -288
  68. package/lib/queryBuilder/join/TableNode.js +117 -144
  69. package/lib/queryBuilder/join/TableTree.js +60 -76
  70. package/lib/queryBuilder/join/utils.js +10 -16
  71. package/lib/queryBuilder/operations/DelegateOperation.js +93 -133
  72. package/lib/queryBuilder/operations/DeleteOperation.js +33 -37
  73. package/lib/queryBuilder/operations/FindByIdOperation.js +20 -28
  74. package/lib/queryBuilder/operations/FindByIdsOperation.js +17 -23
  75. package/lib/queryBuilder/operations/FindOperation.js +114 -131
  76. package/lib/queryBuilder/operations/FirstOperation.js +14 -19
  77. package/lib/queryBuilder/operations/FromOperation.js +69 -88
  78. package/lib/queryBuilder/operations/InsertAndFetchOperation.js +28 -39
  79. package/lib/queryBuilder/operations/InsertGraphAndFetchOperation.js +25 -35
  80. package/lib/queryBuilder/operations/InsertGraphOperation.js +77 -98
  81. package/lib/queryBuilder/operations/InsertOperation.js +132 -165
  82. package/lib/queryBuilder/operations/InstanceDeleteOperation.js +27 -36
  83. package/lib/queryBuilder/operations/InstanceFindOperation.js +9 -13
  84. package/lib/queryBuilder/operations/InstanceInsertOperation.js +13 -17
  85. package/lib/queryBuilder/operations/InstanceUpdateOperation.js +32 -46
  86. package/lib/queryBuilder/operations/JoinRelatedOperation.js +66 -86
  87. package/lib/queryBuilder/operations/KnexOperation.js +4 -7
  88. package/lib/queryBuilder/operations/MergeOperation.js +32 -45
  89. package/lib/queryBuilder/operations/ObjectionToKnexConvertingOperation.js +131 -150
  90. package/lib/queryBuilder/operations/OnBuildKnexOperation.js +17 -23
  91. package/lib/queryBuilder/operations/OnBuildOperation.js +17 -23
  92. package/lib/queryBuilder/operations/OnErrorOperation.js +17 -23
  93. package/lib/queryBuilder/operations/QueryBuilderOperation.js +231 -270
  94. package/lib/queryBuilder/operations/RangeOperation.js +30 -40
  95. package/lib/queryBuilder/operations/RelateOperation.js +14 -21
  96. package/lib/queryBuilder/operations/ReturningOperation.js +12 -18
  97. package/lib/queryBuilder/operations/RunAfterOperation.js +17 -23
  98. package/lib/queryBuilder/operations/RunBeforeOperation.js +17 -23
  99. package/lib/queryBuilder/operations/UnrelateOperation.js +12 -17
  100. package/lib/queryBuilder/operations/UpdateAndFetchOperation.js +48 -65
  101. package/lib/queryBuilder/operations/UpdateOperation.js +104 -129
  102. package/lib/queryBuilder/operations/UpsertGraphAndFetchOperation.js +25 -35
  103. package/lib/queryBuilder/operations/UpsertGraphOperation.js +36 -55
  104. package/lib/queryBuilder/operations/WhereCompositeOperation.js +30 -39
  105. package/lib/queryBuilder/operations/WhereInOperation.js +34 -36
  106. package/lib/queryBuilder/operations/eager/EagerOperation.js +37 -52
  107. package/lib/queryBuilder/operations/eager/JoinEagerOperation.js +34 -44
  108. package/lib/queryBuilder/operations/eager/NaiveEagerOperation.js +4 -7
  109. package/lib/queryBuilder/operations/eager/WhereInEagerOperation.js +193 -251
  110. package/lib/queryBuilder/operations/jsonApi/WhereJsonHasOperation.js +18 -25
  111. package/lib/queryBuilder/operations/jsonApi/WhereJsonNotObjectOperation.js +25 -41
  112. package/lib/queryBuilder/operations/jsonApi/WhereJsonOperation.js +19 -20
  113. package/lib/queryBuilder/operations/jsonApi/WhereJsonOverlapsOperation.js +23 -21
  114. package/lib/queryBuilder/operations/jsonApi/mysqlJsonApi.js +106 -118
  115. package/lib/queryBuilder/operations/jsonApi/postgresJsonApi.js +79 -108
  116. package/lib/queryBuilder/operations/select/SelectOperation.js +37 -53
  117. package/lib/queryBuilder/operations/select/Selection.js +94 -105
  118. package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeMsSqlOperation.js +68 -101
  119. package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeOperation.js +65 -75
  120. package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeSqliteOperation.js +75 -84
  121. package/lib/queryBuilder/parsers/jsonFieldExpressionParser.js +760 -859
  122. package/lib/queryBuilder/parsers/relationExpressionParser.js +840 -952
  123. package/lib/queryBuilder/transformations/CompositeQueryTransformation.js +10 -15
  124. package/lib/queryBuilder/transformations/QueryTransformation.js +4 -6
  125. package/lib/queryBuilder/transformations/WrapMysqlModifySubqueryTransformation.js +35 -49
  126. package/lib/queryBuilder/transformations/index.js +3 -9
  127. package/lib/queryBuilder/whereScopes.js +158 -186
  128. package/lib/relations/Relation.js +279 -363
  129. package/lib/relations/RelationDeleteOperation.js +16 -22
  130. package/lib/relations/RelationFindOperation.js +100 -133
  131. package/lib/relations/RelationInsertOperation.js +19 -27
  132. package/lib/relations/RelationOwner.js +167 -204
  133. package/lib/relations/RelationProperty.js +177 -217
  134. package/lib/relations/RelationUpdateOperation.js +16 -23
  135. package/lib/relations/belongsToOne/BelongsToOneDeleteOperation.js +11 -16
  136. package/lib/relations/belongsToOne/BelongsToOneInsertOperation.js +24 -35
  137. package/lib/relations/belongsToOne/BelongsToOneRelateOperation.js +30 -41
  138. package/lib/relations/belongsToOne/BelongsToOneRelation.js +33 -41
  139. package/lib/relations/belongsToOne/BelongsToOneUnrelateOperation.js +38 -53
  140. package/lib/relations/hasMany/HasManyInsertOperation.js +35 -51
  141. package/lib/relations/hasMany/HasManyRelateOperation.js +38 -54
  142. package/lib/relations/hasMany/HasManyRelation.js +30 -38
  143. package/lib/relations/hasMany/HasManyUnrelateOperation.js +19 -26
  144. package/lib/relations/hasOne/HasOneRelation.js +4 -7
  145. package/lib/relations/hasOneThrough/HasOneThroughRelation.js +4 -7
  146. package/lib/relations/manyToMany/ManyToManyModifyMixin.js +67 -90
  147. package/lib/relations/manyToMany/ManyToManyRelation.js +349 -451
  148. package/lib/relations/manyToMany/ManyToManySqliteModifyMixin.js +19 -26
  149. package/lib/relations/manyToMany/delete/ManyToManyDeleteOperation.js +3 -5
  150. package/lib/relations/manyToMany/delete/ManyToManyDeleteOperationBase.js +14 -20
  151. package/lib/relations/manyToMany/delete/ManyToManyDeleteSqliteOperation.js +3 -7
  152. package/lib/relations/manyToMany/find/ManyToManyFindOperation.js +71 -94
  153. package/lib/relations/manyToMany/insert/ManyToManyInsertOperation.js +31 -43
  154. package/lib/relations/manyToMany/relate/ManyToManyRelateOperation.js +50 -67
  155. package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateOperation.js +4 -7
  156. package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateOperationBase.js +20 -27
  157. package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateSqliteOperation.js +5 -10
  158. package/lib/relations/manyToMany/update/ManyToManyUpdateOperation.js +3 -5
  159. package/lib/relations/manyToMany/update/ManyToManyUpdateOperationBase.js +55 -72
  160. package/lib/relations/manyToMany/update/ManyToManyUpdateSqliteOperation.js +3 -7
  161. package/lib/transaction.js +53 -83
  162. package/lib/utils/assert.js +15 -21
  163. package/lib/utils/buildUtils.js +17 -19
  164. package/lib/utils/classUtils.js +7 -11
  165. package/lib/utils/cloneDeep.js +365 -0
  166. package/lib/utils/createModifier.js +36 -41
  167. package/lib/utils/deprecate.js +8 -12
  168. package/lib/utils/identifierMapping.js +153 -192
  169. package/lib/utils/internalPropUtils.js +4 -8
  170. package/lib/utils/knexUtils.js +61 -56
  171. package/lib/utils/mixin.js +16 -23
  172. package/lib/utils/mysqlJsonPath.js +55 -40
  173. package/lib/utils/normalizeIds.js +110 -127
  174. package/lib/utils/objectUtils.js +236 -338
  175. package/lib/utils/parseFieldExpression.js +66 -44
  176. package/lib/utils/postgresJsonPath.js +48 -62
  177. package/lib/utils/promiseUtils/after.js +10 -13
  178. package/lib/utils/promiseUtils/afterReturn.js +10 -13
  179. package/lib/utils/promiseUtils/index.js +15 -17
  180. package/lib/utils/promiseUtils/isPromise.js +6 -9
  181. package/lib/utils/promiseUtils/map.js +75 -89
  182. package/lib/utils/promiseUtils/mapAfterAllReturn.js +17 -23
  183. package/lib/utils/promiseUtils/try.js +15 -18
  184. package/lib/utils/resolveModel.js +91 -94
  185. package/lib/utils/tmpColumnUtils.js +4 -13
  186. package/package.json +50 -23
  187. package/typings/objection/index.d.mts +362 -0
  188. package/typings/objection/index.d.ts +36 -9
  189. package/lib/.eslintrc.json +0 -8
  190. package/lib/queryBuilder/parsers/jsonFieldExpressionParser.pegjs +0 -97
  191. package/lib/queryBuilder/parsers/relationExpressionParser.pegjs +0 -141
  192. package/lib/utils/clone.js +0 -2329
@@ -1,8 +1,6 @@
1
1
  'use strict';
2
-
3
2
  const { withWhereScope } = require('../../queryBuilder/whereScopes');
4
3
  const { ManyToManyFindOperation } = require('./find/ManyToManyFindOperation');
5
-
6
4
  // This mixin contains the shared code for all modify operations (update, delete, relate, unrelate)
7
5
  // for ManyToManyRelation operations.
8
6
  //
@@ -12,94 +10,73 @@ const { ManyToManyFindOperation } = require('./find/ManyToManyFindOperation');
12
10
  // joins in updates or deletes. Join table is joined so that queries can reference the join
13
11
  // table columns.
14
12
  const ManyToManyModifyMixin = (Operation) => {
15
- return class extends Operation {
16
- constructor(...args) {
17
- super(...args);
18
- this.modifyFilterSubquery = null;
19
- }
20
-
21
- get modifyMainQuery() {
22
- return true;
23
- }
24
-
25
- // At this point `builder` should only have the user's own wheres and joins. There can
26
- // be other operations (like orderBy) too, but those are meaningless with modify operations.
27
- onBuild(builder) {
28
- this.modifyFilterSubquery = this.createModifyFilterSubquery(builder);
29
-
30
- if (this.modifyMainQuery) {
31
- // We can now remove the where and join statements from the main query.
32
- this.removeFiltersFromMainQuery(builder);
33
-
34
- // Add a single where clause that uses the created subquery.
35
- withWhereScope(builder, () => this.applyModifyFilterForRelatedTable(builder));
36
- }
37
-
38
- return super.onBuild(builder);
39
- }
40
-
41
- createModifyFilterSubquery(builder) {
42
- const relatedModelClass = this.relation.relatedModelClass;
43
- const builderClass = builder.constructor;
44
-
45
- // Create an empty subquery.
46
- const modifyFilterSubquery = relatedModelClass.query().childQueryOf(builder);
47
-
48
- // Add the necessary joins and wheres so that only rows related to
49
- // `this.owner` are selected.
50
- this.relation.findQuery(modifyFilterSubquery, this.owner);
51
-
52
- // Copy all where and join statements from the main query to the subquery.
53
- modifyFilterSubquery
54
- .copyFrom(builder, builderClass.WhereSelector)
55
- .copyFrom(builder, builderClass.JoinSelector);
56
-
57
- return modifyFilterSubquery.clearSelect();
58
- }
59
-
60
- removeFiltersFromMainQuery(builder) {
61
- const builderClass = builder.constructor;
62
-
63
- builder.clear(builderClass.WhereSelector);
64
- builder.clear(builderClass.JoinSelector);
65
- }
66
-
67
- applyModifyFilterForRelatedTable(builder) {
68
- const idRefs = this.relation.relatedModelClass.getIdRelationProperty().refs(builder);
69
- const subquery = this.modifyFilterSubquery.clone().select(idRefs);
70
-
71
- return builder.whereInComposite(idRefs, subquery);
72
- }
73
-
74
- applyModifyFilterForJoinTable(builder) {
75
- const joinTableOwnerRefs = this.relation.joinTableOwnerProp.refs(builder);
76
- const joinTableRelatedRefs = this.relation.joinTableRelatedProp.refs(builder);
77
-
78
- const relatedRefs = this.relation.relatedProp.refs(builder);
79
- const ownerValues = this.owner.getProps(this.relation);
80
-
81
- const subquery = this.modifyFilterSubquery.clone().select(relatedRefs);
82
-
83
- return builder
84
- .whereInComposite(joinTableRelatedRefs, subquery)
85
- .whereInComposite(joinTableOwnerRefs, ownerValues);
86
- }
87
-
88
- toFindOperation() {
89
- return new ManyToManyFindOperation('find', {
90
- relation: this.relation,
91
- owner: this.owner,
92
- });
93
- }
94
-
95
- clone() {
96
- const clone = super.clone();
97
- clone.modifyFilterSubquery = this.modifyFilterSubquery;
98
- return clone;
99
- }
100
- };
13
+ return class extends Operation {
14
+ constructor(...args) {
15
+ super(...args);
16
+ this.modifyFilterSubquery = null;
17
+ }
18
+ get modifyMainQuery() {
19
+ return true;
20
+ }
21
+ // At this point `builder` should only have the user's own wheres and joins. There can
22
+ // be other operations (like orderBy) too, but those are meaningless with modify operations.
23
+ onBuild(builder) {
24
+ this.modifyFilterSubquery = this.createModifyFilterSubquery(builder);
25
+ if (this.modifyMainQuery) {
26
+ // We can now remove the where and join statements from the main query.
27
+ this.removeFiltersFromMainQuery(builder);
28
+ // Add a single where clause that uses the created subquery.
29
+ withWhereScope(builder, () => this.applyModifyFilterForRelatedTable(builder));
30
+ }
31
+ return super.onBuild(builder);
32
+ }
33
+ createModifyFilterSubquery(builder) {
34
+ const relatedModelClass = this.relation.relatedModelClass;
35
+ const builderClass = builder.constructor;
36
+ // Create an empty subquery.
37
+ const modifyFilterSubquery = relatedModelClass.query().childQueryOf(builder);
38
+ // Add the necessary joins and wheres so that only rows related to
39
+ // `this.owner` are selected.
40
+ this.relation.findQuery(modifyFilterSubquery, this.owner);
41
+ // Copy all where and join statements from the main query to the subquery.
42
+ modifyFilterSubquery
43
+ .copyFrom(builder, builderClass.WhereSelector)
44
+ .copyFrom(builder, builderClass.JoinSelector);
45
+ return modifyFilterSubquery.clearSelect();
46
+ }
47
+ removeFiltersFromMainQuery(builder) {
48
+ const builderClass = builder.constructor;
49
+ builder.clear(builderClass.WhereSelector);
50
+ builder.clear(builderClass.JoinSelector);
51
+ }
52
+ applyModifyFilterForRelatedTable(builder) {
53
+ const idRefs = this.relation.relatedModelClass.getIdRelationProperty().refs(builder);
54
+ const subquery = this.modifyFilterSubquery.clone().select(idRefs);
55
+ return builder.whereInComposite(idRefs, subquery);
56
+ }
57
+ applyModifyFilterForJoinTable(builder) {
58
+ const joinTableOwnerRefs = this.relation.joinTableOwnerProp.refs(builder);
59
+ const joinTableRelatedRefs = this.relation.joinTableRelatedProp.refs(builder);
60
+ const relatedRefs = this.relation.relatedProp.refs(builder);
61
+ const ownerValues = this.owner.getProps(this.relation);
62
+ const subquery = this.modifyFilterSubquery.clone().select(relatedRefs);
63
+ return builder
64
+ .whereInComposite(joinTableRelatedRefs, subquery)
65
+ .whereInComposite(joinTableOwnerRefs, ownerValues);
66
+ }
67
+ toFindOperation() {
68
+ return new ManyToManyFindOperation('find', {
69
+ relation: this.relation,
70
+ owner: this.owner,
71
+ });
72
+ }
73
+ clone() {
74
+ const clone = super.clone();
75
+ clone.modifyFilterSubquery = this.modifyFilterSubquery;
76
+ return clone;
77
+ }
78
+ };
101
79
  };
102
-
103
80
  module.exports = {
104
- ManyToManyModifyMixin,
81
+ ManyToManyModifyMixin,
105
82
  };