@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,12 +1,10 @@
1
1
  'use strict';
2
-
3
2
  class ModifierNotFoundError extends Error {
4
- constructor(modifierName) {
5
- super(`Unable to determine modify function from provided value: "${modifierName}".`);
6
- this.modifierName = modifierName;
7
- }
3
+ constructor(modifierName) {
4
+ super(`Unable to determine modify function from provided value: "${modifierName}".`);
5
+ this.modifierName = modifierName;
6
+ }
8
7
  }
9
-
10
8
  module.exports = {
11
- ModifierNotFoundError,
9
+ ModifierNotFoundError,
12
10
  };
@@ -1,23 +1,19 @@
1
1
  'use strict';
2
-
3
2
  class NotFoundError extends Error {
4
- constructor({ modelClass, data = {}, statusCode = 404, ...rest } = {}) {
5
- super(rest.message || 'NotFoundError');
6
-
7
- this.type = 'NotFound';
8
- this.name = this.constructor.name;
9
- this.data = { ...rest, ...data };
10
- this.statusCode = statusCode;
11
-
12
- // Add as non-enumerable in case people are passing instances of
13
- // this error directly to `JSON.stringify`.
14
- Object.defineProperty(this, 'modelClass', {
15
- value: modelClass,
16
- enumerable: false,
17
- });
18
- }
3
+ constructor({ modelClass, data = {}, statusCode = 404, ...rest } = {}) {
4
+ super(rest.message || 'NotFoundError');
5
+ this.type = 'NotFound';
6
+ this.name = this.constructor.name;
7
+ this.data = { ...rest, ...data };
8
+ this.statusCode = statusCode;
9
+ // Add as non-enumerable in case people are passing instances of
10
+ // this error directly to `JSON.stringify`.
11
+ Object.defineProperty(this, 'modelClass', {
12
+ value: modelClass,
13
+ enumerable: false,
14
+ });
15
+ }
19
16
  }
20
-
21
17
  module.exports = {
22
- NotFoundError,
18
+ NotFoundError,
23
19
  };
@@ -1,14 +1,11 @@
1
1
  'use strict';
2
-
3
2
  class RelationDoesNotExistError extends Error {
4
- constructor(relationName) {
5
- super(`unknown relation "${relationName}" in a relation expression`);
6
-
7
- this.name = this.constructor.name;
8
- this.relationName = relationName;
9
- }
3
+ constructor(relationName) {
4
+ super(`unknown relation "${relationName}" in a relation expression`);
5
+ this.name = this.constructor.name;
6
+ this.relationName = relationName;
7
+ }
10
8
  }
11
-
12
9
  module.exports = {
13
- RelationDoesNotExistError,
10
+ RelationDoesNotExistError,
14
11
  };
@@ -1,54 +1,46 @@
1
1
  'use strict';
2
-
3
2
  const { asArray, isString } = require('../utils/objectUtils');
4
-
5
3
  const ValidationErrorType = {
6
- ModelValidation: 'ModelValidation',
7
- RelationExpression: 'RelationExpression',
8
- UnallowedRelation: 'UnallowedRelation',
9
- InvalidGraph: 'InvalidGraph',
4
+ ModelValidation: 'ModelValidation',
5
+ RelationExpression: 'RelationExpression',
6
+ UnallowedRelation: 'UnallowedRelation',
7
+ InvalidGraph: 'InvalidGraph',
10
8
  };
11
-
12
9
  class ValidationError extends Error {
13
- static get Type() {
14
- return ValidationErrorType;
15
- }
16
-
17
- constructor({ type, message, modelClass, data = {}, statusCode = 400 }) {
18
- super(message || errorsToMessage(data));
19
-
20
- this.name = this.constructor.name;
21
- this.type = type;
22
- this.data = data;
23
- this.statusCode = statusCode;
24
-
25
- // Add as non-enumerable in case people are passing instances of
26
- // this error directly to `JSON.stringify`.
27
- Object.defineProperty(this, 'modelClass', {
28
- value: modelClass,
29
- enumerable: false,
30
- });
31
- }
10
+ static get Type() {
11
+ return ValidationErrorType;
12
+ }
13
+ constructor({ type, message, modelClass, data = {}, statusCode = 400 }) {
14
+ super(message || errorsToMessage(data));
15
+ this.name = this.constructor.name;
16
+ this.type = type;
17
+ this.data = data;
18
+ this.statusCode = statusCode;
19
+ // Add as non-enumerable in case people are passing instances of
20
+ // this error directly to `JSON.stringify`.
21
+ Object.defineProperty(this, 'modelClass', {
22
+ value: modelClass,
23
+ enumerable: false,
24
+ });
25
+ }
32
26
  }
33
-
34
27
  function errorsToMessage(data) {
35
- return Object.keys(data)
36
- .reduce((messages, key) => {
37
- messages.push(`${key}: ${asArray(data[key]).map(message).join(', ')}`);
38
- return messages;
28
+ return Object.keys(data)
29
+ .reduce((messages, key) => {
30
+ messages.push(`${key}: ${asArray(data[key]).map(message).join(', ')}`);
31
+ return messages;
39
32
  }, [])
40
- .join(', ');
33
+ .join(', ');
41
34
  }
42
-
43
35
  function message(it) {
44
- if (isString(it)) {
45
- return it;
46
- } else {
47
- return it.message;
48
- }
36
+ if (isString(it)) {
37
+ return it;
38
+ }
39
+ else {
40
+ return it.message;
41
+ }
49
42
  }
50
-
51
43
  module.exports = {
52
- ValidationError,
53
- ValidationErrorType,
44
+ ValidationError,
45
+ ValidationErrorType,
54
46
  };
@@ -1,26 +1,20 @@
1
1
  'use strict';
2
-
3
2
  class Validator {
4
- constructor(...args) {
5
- this.constructor.init(this, ...args);
6
- }
7
-
8
- static init() {}
9
-
10
- beforeValidate({ model, json, options }) {
11
- model.$beforeValidate(null, json, options);
12
- }
13
-
14
- validate() {
15
- /* istanbul ignore next */
16
- throw new Error('not implemented');
17
- }
18
-
19
- afterValidate({ model, json, options }) {
20
- model.$afterValidate(json, options);
21
- }
3
+ constructor(...args) {
4
+ this.constructor.init(this, ...args);
5
+ }
6
+ static init() { }
7
+ beforeValidate({ model, json, options }) {
8
+ model.$beforeValidate(null, json, options);
9
+ }
10
+ validate() {
11
+ /* istanbul ignore next */
12
+ throw new Error('not implemented');
13
+ }
14
+ afterValidate({ model, json, options }) {
15
+ model.$afterValidate(json, options);
16
+ }
22
17
  }
23
-
24
18
  module.exports = {
25
- Validator,
19
+ Validator,
26
20
  };
@@ -1,9 +1,7 @@
1
1
  'use strict';
2
-
3
2
  // A small helper method for cached lazy-importing of the Model class.
4
3
  let Model;
5
4
  const getModel = () => Model || (Model = require('./Model').Model);
6
-
7
5
  module.exports = {
8
- getModel,
6
+ getModel,
9
7
  };
@@ -1,80 +1,60 @@
1
1
  'use strict';
2
-
3
2
  const { ModelGraphBuilder } = require('./ModelGraphBuilder');
4
3
  const NOT_CALCULATED = {};
5
-
6
4
  class ModelGraph {
7
- constructor(nodes, edges) {
8
- this.nodes = nodes;
9
- this.edges = edges;
10
-
11
- // These are calculated lazily.
12
- this._nodesByObjects = NOT_CALCULATED;
13
- this._nodesByIdPathKeys = NOT_CALCULATED;
14
- }
15
-
16
- static create(rootModelClass, roots) {
17
- const builder = ModelGraphBuilder.buildGraph(rootModelClass, roots);
18
- return new ModelGraph(builder.nodes, builder.edges);
19
- }
20
-
21
- static createEmpty() {
22
- return new ModelGraph([], []);
23
- }
24
-
25
- get rootObjects() {
26
- return this.nodes.filter((node) => !node.parentEdge).map((node) => node.obj);
27
- }
28
-
29
- nodeForObject(obj) {
30
- if (!obj) {
31
- return null;
5
+ constructor(nodes, edges) {
6
+ this.nodes = nodes;
7
+ this.edges = edges;
8
+ // These are calculated lazily.
9
+ this._nodesByObjects = NOT_CALCULATED;
10
+ this._nodesByIdPathKeys = NOT_CALCULATED;
32
11
  }
33
-
34
- if (this._nodesByObjects === NOT_CALCULATED) {
35
- this._nodesByObjects = createNodesByObjectsMap(this.nodes);
12
+ static create(rootModelClass, roots) {
13
+ const builder = ModelGraphBuilder.buildGraph(rootModelClass, roots);
14
+ return new ModelGraph(builder.nodes, builder.edges);
36
15
  }
37
-
38
- return this._nodesByObjects.get(obj) || null;
39
- }
40
-
41
- nodeForNode(node) {
42
- if (!node) {
43
- return null;
16
+ static createEmpty() {
17
+ return new ModelGraph([], []);
44
18
  }
45
-
46
- if (this._nodesByIdPathKeys === NOT_CALCULATED) {
47
- this._nodesByIdPathKeys = createNodesByIdPathKeysMap(this.nodes);
19
+ get rootObjects() {
20
+ return this.nodes.filter((node) => !node.parentEdge).map((node) => node.obj);
21
+ }
22
+ nodeForObject(obj) {
23
+ if (!obj) {
24
+ return null;
25
+ }
26
+ if (this._nodesByObjects === NOT_CALCULATED) {
27
+ this._nodesByObjects = createNodesByObjectsMap(this.nodes);
28
+ }
29
+ return this._nodesByObjects.get(obj) || null;
30
+ }
31
+ nodeForNode(node) {
32
+ if (!node) {
33
+ return null;
34
+ }
35
+ if (this._nodesByIdPathKeys === NOT_CALCULATED) {
36
+ this._nodesByIdPathKeys = createNodesByIdPathKeysMap(this.nodes);
37
+ }
38
+ return this._nodesByIdPathKeys.get(node.idPathKey) || null;
48
39
  }
49
-
50
- return this._nodesByIdPathKeys.get(node.idPathKey) || null;
51
- }
52
40
  }
53
-
54
41
  function createNodesByObjectsMap(nodes) {
55
- const nodesByObjects = new Map();
56
-
57
- for (const node of nodes) {
58
- nodesByObjects.set(node.obj, node);
59
- }
60
-
61
- return nodesByObjects;
42
+ const nodesByObjects = new Map();
43
+ for (const node of nodes) {
44
+ nodesByObjects.set(node.obj, node);
45
+ }
46
+ return nodesByObjects;
62
47
  }
63
-
64
48
  function createNodesByIdPathKeysMap(nodes) {
65
- const nodesByIdPathKeys = new Map();
66
-
67
- for (const node of nodes) {
68
- const idPathKey = node.idPathKey;
69
-
70
- if (idPathKey !== null) {
71
- nodesByIdPathKeys.set(idPathKey, node);
49
+ const nodesByIdPathKeys = new Map();
50
+ for (const node of nodes) {
51
+ const idPathKey = node.idPathKey;
52
+ if (idPathKey !== null) {
53
+ nodesByIdPathKeys.set(idPathKey, node);
54
+ }
72
55
  }
73
- }
74
-
75
- return nodesByIdPathKeys;
56
+ return nodesByIdPathKeys;
76
57
  }
77
-
78
58
  module.exports = {
79
- ModelGraph,
59
+ ModelGraph,
80
60
  };