@mikro-orm/core 7.0.2-dev.9 → 7.0.2

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 (207) hide show
  1. package/EntityManager.d.ts +883 -579
  2. package/EntityManager.js +1897 -1865
  3. package/MikroORM.d.ts +103 -72
  4. package/MikroORM.js +178 -177
  5. package/README.md +128 -294
  6. package/cache/CacheAdapter.d.ts +38 -36
  7. package/cache/FileCacheAdapter.d.ts +30 -24
  8. package/cache/FileCacheAdapter.js +80 -78
  9. package/cache/GeneratedCacheAdapter.d.ts +19 -20
  10. package/cache/GeneratedCacheAdapter.js +31 -30
  11. package/cache/MemoryCacheAdapter.d.ts +19 -20
  12. package/cache/MemoryCacheAdapter.js +36 -36
  13. package/cache/NullCacheAdapter.d.ts +17 -16
  14. package/cache/NullCacheAdapter.js +25 -24
  15. package/connections/Connection.d.ts +99 -75
  16. package/connections/Connection.js +166 -160
  17. package/drivers/DatabaseDriver.d.ts +187 -69
  18. package/drivers/DatabaseDriver.js +451 -432
  19. package/drivers/IDatabaseDriver.d.ts +464 -281
  20. package/drivers/IDatabaseDriver.js +1 -0
  21. package/entity/BaseEntity.d.ts +121 -73
  22. package/entity/BaseEntity.js +44 -33
  23. package/entity/Collection.d.ts +216 -157
  24. package/entity/Collection.js +728 -707
  25. package/entity/EntityAssigner.d.ts +90 -76
  26. package/entity/EntityAssigner.js +232 -229
  27. package/entity/EntityFactory.d.ts +68 -40
  28. package/entity/EntityFactory.js +427 -366
  29. package/entity/EntityHelper.d.ts +34 -22
  30. package/entity/EntityHelper.js +280 -267
  31. package/entity/EntityIdentifier.d.ts +4 -4
  32. package/entity/EntityIdentifier.js +10 -10
  33. package/entity/EntityLoader.d.ts +105 -56
  34. package/entity/EntityLoader.js +754 -722
  35. package/entity/EntityRepository.d.ts +317 -200
  36. package/entity/EntityRepository.js +214 -212
  37. package/entity/PolymorphicRef.d.ts +5 -5
  38. package/entity/PolymorphicRef.js +10 -10
  39. package/entity/Reference.d.ts +130 -66
  40. package/entity/Reference.js +280 -260
  41. package/entity/WrappedEntity.d.ts +116 -53
  42. package/entity/WrappedEntity.js +169 -147
  43. package/entity/defineEntity.d.ts +1290 -614
  44. package/entity/defineEntity.js +521 -511
  45. package/entity/utils.d.ts +13 -3
  46. package/entity/utils.js +71 -73
  47. package/entity/validators.js +43 -43
  48. package/entity/wrap.js +8 -8
  49. package/enums.d.ts +275 -138
  50. package/enums.js +268 -137
  51. package/errors.d.ts +120 -72
  52. package/errors.js +356 -253
  53. package/events/EventManager.d.ts +27 -10
  54. package/events/EventManager.js +80 -73
  55. package/events/EventSubscriber.d.ts +33 -29
  56. package/events/TransactionEventBroadcaster.d.ts +16 -7
  57. package/events/TransactionEventBroadcaster.js +15 -13
  58. package/exceptions.d.ts +23 -40
  59. package/exceptions.js +35 -52
  60. package/hydration/Hydrator.d.ts +43 -16
  61. package/hydration/Hydrator.js +44 -42
  62. package/hydration/ObjectHydrator.d.ts +51 -17
  63. package/hydration/ObjectHydrator.js +480 -416
  64. package/index.d.ts +116 -2
  65. package/index.js +10 -1
  66. package/logging/DefaultLogger.d.ts +35 -30
  67. package/logging/DefaultLogger.js +87 -84
  68. package/logging/Logger.d.ts +45 -40
  69. package/logging/SimpleLogger.d.ts +13 -11
  70. package/logging/SimpleLogger.js +22 -22
  71. package/logging/colors.d.ts +6 -6
  72. package/logging/colors.js +11 -10
  73. package/logging/inspect.js +7 -7
  74. package/metadata/EntitySchema.d.ts +214 -108
  75. package/metadata/EntitySchema.js +398 -379
  76. package/metadata/MetadataDiscovery.d.ts +115 -111
  77. package/metadata/MetadataDiscovery.js +1948 -1857
  78. package/metadata/MetadataProvider.d.ts +25 -14
  79. package/metadata/MetadataProvider.js +83 -77
  80. package/metadata/MetadataStorage.d.ts +39 -19
  81. package/metadata/MetadataStorage.js +119 -106
  82. package/metadata/MetadataValidator.d.ts +39 -39
  83. package/metadata/MetadataValidator.js +381 -338
  84. package/metadata/discover-entities.d.ts +5 -2
  85. package/metadata/discover-entities.js +27 -27
  86. package/metadata/types.d.ts +615 -531
  87. package/naming-strategy/AbstractNamingStrategy.d.ts +55 -39
  88. package/naming-strategy/AbstractNamingStrategy.js +91 -85
  89. package/naming-strategy/EntityCaseNamingStrategy.d.ts +6 -6
  90. package/naming-strategy/EntityCaseNamingStrategy.js +22 -22
  91. package/naming-strategy/MongoNamingStrategy.d.ts +7 -6
  92. package/naming-strategy/MongoNamingStrategy.js +19 -18
  93. package/naming-strategy/NamingStrategy.d.ts +109 -99
  94. package/naming-strategy/UnderscoreNamingStrategy.d.ts +8 -7
  95. package/naming-strategy/UnderscoreNamingStrategy.js +22 -21
  96. package/not-supported.js +7 -4
  97. package/package.json +1 -1
  98. package/platforms/ExceptionConverter.d.ts +2 -1
  99. package/platforms/ExceptionConverter.js +5 -4
  100. package/platforms/Platform.d.ts +310 -236
  101. package/platforms/Platform.js +661 -573
  102. package/serialization/EntitySerializer.d.ts +49 -25
  103. package/serialization/EntitySerializer.js +224 -216
  104. package/serialization/EntityTransformer.d.ts +11 -5
  105. package/serialization/EntityTransformer.js +220 -216
  106. package/serialization/SerializationContext.d.ts +27 -18
  107. package/serialization/SerializationContext.js +105 -100
  108. package/types/ArrayType.d.ts +9 -8
  109. package/types/ArrayType.js +34 -33
  110. package/types/BigIntType.d.ts +17 -10
  111. package/types/BigIntType.js +37 -37
  112. package/types/BlobType.d.ts +4 -3
  113. package/types/BlobType.js +14 -13
  114. package/types/BooleanType.d.ts +5 -4
  115. package/types/BooleanType.js +13 -12
  116. package/types/CharacterType.d.ts +3 -2
  117. package/types/CharacterType.js +7 -6
  118. package/types/DateTimeType.d.ts +6 -5
  119. package/types/DateTimeType.js +16 -15
  120. package/types/DateType.d.ts +6 -5
  121. package/types/DateType.js +16 -15
  122. package/types/DecimalType.d.ts +7 -7
  123. package/types/DecimalType.js +26 -26
  124. package/types/DoubleType.d.ts +3 -3
  125. package/types/DoubleType.js +12 -12
  126. package/types/EnumArrayType.d.ts +6 -5
  127. package/types/EnumArrayType.js +25 -24
  128. package/types/EnumType.d.ts +4 -3
  129. package/types/EnumType.js +12 -11
  130. package/types/FloatType.d.ts +4 -3
  131. package/types/FloatType.js +10 -9
  132. package/types/IntegerType.d.ts +4 -3
  133. package/types/IntegerType.js +10 -9
  134. package/types/IntervalType.d.ts +5 -4
  135. package/types/IntervalType.js +13 -12
  136. package/types/JsonType.d.ts +9 -8
  137. package/types/JsonType.js +33 -32
  138. package/types/MediumIntType.d.ts +2 -1
  139. package/types/MediumIntType.js +4 -3
  140. package/types/SmallIntType.d.ts +4 -3
  141. package/types/SmallIntType.js +10 -9
  142. package/types/StringType.d.ts +5 -4
  143. package/types/StringType.js +13 -12
  144. package/types/TextType.d.ts +4 -3
  145. package/types/TextType.js +10 -9
  146. package/types/TimeType.d.ts +6 -5
  147. package/types/TimeType.js +18 -17
  148. package/types/TinyIntType.d.ts +4 -3
  149. package/types/TinyIntType.js +11 -10
  150. package/types/Type.d.ts +88 -73
  151. package/types/Type.js +85 -74
  152. package/types/Uint8ArrayType.d.ts +5 -4
  153. package/types/Uint8ArrayType.js +22 -21
  154. package/types/UnknownType.d.ts +5 -4
  155. package/types/UnknownType.js +13 -12
  156. package/types/UuidType.d.ts +6 -5
  157. package/types/UuidType.js +20 -19
  158. package/types/index.d.ts +77 -49
  159. package/types/index.js +64 -26
  160. package/typings.d.ts +1388 -729
  161. package/typings.js +255 -231
  162. package/unit-of-work/ChangeSet.d.ts +28 -24
  163. package/unit-of-work/ChangeSet.js +58 -54
  164. package/unit-of-work/ChangeSetComputer.d.ts +13 -11
  165. package/unit-of-work/ChangeSetComputer.js +180 -159
  166. package/unit-of-work/ChangeSetPersister.d.ts +64 -41
  167. package/unit-of-work/ChangeSetPersister.js +443 -418
  168. package/unit-of-work/CommitOrderCalculator.d.ts +40 -40
  169. package/unit-of-work/CommitOrderCalculator.js +89 -88
  170. package/unit-of-work/IdentityMap.d.ts +32 -25
  171. package/unit-of-work/IdentityMap.js +106 -99
  172. package/unit-of-work/UnitOfWork.d.ts +182 -127
  173. package/unit-of-work/UnitOfWork.js +1201 -1169
  174. package/utils/AbstractMigrator.d.ts +111 -91
  175. package/utils/AbstractMigrator.js +275 -275
  176. package/utils/AbstractSchemaGenerator.d.ts +43 -34
  177. package/utils/AbstractSchemaGenerator.js +121 -122
  178. package/utils/AsyncContext.d.ts +3 -3
  179. package/utils/AsyncContext.js +34 -35
  180. package/utils/Configuration.d.ts +853 -801
  181. package/utils/Configuration.js +360 -337
  182. package/utils/Cursor.d.ts +40 -22
  183. package/utils/Cursor.js +135 -127
  184. package/utils/DataloaderUtils.d.ts +58 -43
  185. package/utils/DataloaderUtils.js +203 -198
  186. package/utils/EntityComparator.d.ts +99 -80
  187. package/utils/EntityComparator.js +825 -727
  188. package/utils/NullHighlighter.d.ts +2 -1
  189. package/utils/NullHighlighter.js +4 -3
  190. package/utils/QueryHelper.d.ts +79 -51
  191. package/utils/QueryHelper.js +372 -361
  192. package/utils/RawQueryFragment.d.ts +54 -28
  193. package/utils/RawQueryFragment.js +110 -99
  194. package/utils/RequestContext.d.ts +33 -32
  195. package/utils/RequestContext.js +52 -53
  196. package/utils/TransactionContext.d.ts +17 -16
  197. package/utils/TransactionContext.js +28 -27
  198. package/utils/TransactionManager.d.ts +58 -58
  199. package/utils/TransactionManager.js +199 -197
  200. package/utils/Utils.d.ts +210 -145
  201. package/utils/Utils.js +820 -813
  202. package/utils/clone.js +104 -113
  203. package/utils/env-vars.js +90 -88
  204. package/utils/fs-utils.d.ts +15 -15
  205. package/utils/fs-utils.js +180 -181
  206. package/utils/upsert-utils.d.ts +20 -5
  207. package/utils/upsert-utils.js +114 -116
package/entity/utils.d.ts CHANGED
@@ -3,15 +3,25 @@ import { LoadStrategy, ReferenceKind } from '../enums.js';
3
3
  /**
4
4
  * @internal
5
5
  */
6
- export declare function expandDotPaths<Entity>(meta: EntityMetadata<Entity>, populate?: readonly (string | PopulateOptions<Entity>)[], normalized?: boolean): PopulateOptions<Entity>[];
6
+ export declare function expandDotPaths<Entity>(
7
+ meta: EntityMetadata<Entity>,
8
+ populate?: readonly (string | PopulateOptions<Entity>)[],
9
+ normalized?: boolean,
10
+ ): PopulateOptions<Entity>[];
7
11
  /**
8
12
  * Returns the loading strategy based on the provided hint.
9
13
  * If `BALANCED` strategy is used, it will return JOINED if the property is a to-one relation.
10
14
  * @internal
11
15
  */
12
- export declare function getLoadingStrategy(strategy: LoadStrategy | `${LoadStrategy}`, kind: ReferenceKind): LoadStrategy.SELECT_IN | LoadStrategy.JOINED;
16
+ export declare function getLoadingStrategy(
17
+ strategy: LoadStrategy | `${LoadStrategy}`,
18
+ kind: ReferenceKind,
19
+ ): LoadStrategy.SELECT_IN | LoadStrategy.JOINED;
13
20
  /**
14
21
  * Applies per-relation overrides from `populateHints` to the normalized populate tree.
15
22
  * @internal
16
23
  */
17
- export declare function applyPopulateHints<Entity>(populate: PopulateOptions<Entity>[], hints: Record<string, PopulateHintOptions>): void;
24
+ export declare function applyPopulateHints<Entity>(
25
+ populate: PopulateOptions<Entity>[],
26
+ hints: Record<string, PopulateHintOptions>,
27
+ ): void;
package/entity/utils.js CHANGED
@@ -4,57 +4,55 @@ import { Utils } from '../utils/Utils.js';
4
4
  * Expands `books.perex` like populate to use `children` array instead of the dot syntax
5
5
  */
6
6
  function expandNestedPopulate(parentProp, parts, strategy, all) {
7
- const meta = parentProp.targetMeta;
8
- const field = parts.shift();
9
- const prop = meta.properties[field];
10
- const ret = { field, strategy, all };
11
- if (parts.length > 0) {
12
- ret.children = [expandNestedPopulate(prop, parts, strategy)];
13
- }
14
- return ret;
7
+ const meta = parentProp.targetMeta;
8
+ const field = parts.shift();
9
+ const prop = meta.properties[field];
10
+ const ret = { field, strategy, all };
11
+ if (parts.length > 0) {
12
+ ret.children = [expandNestedPopulate(prop, parts, strategy)];
13
+ }
14
+ return ret;
15
15
  }
16
16
  /**
17
17
  * @internal
18
18
  */
19
19
  export function expandDotPaths(meta, populate, normalized = false) {
20
- const ret = normalized
21
- ? populate
22
- : Utils.asArray(populate).map(field => {
23
- if (typeof field === 'string') {
24
- return { field };
25
- }
26
- /* v8 ignore next */
27
- return typeof field === 'boolean' || field.field === PopulatePath.ALL
28
- ? { all: !!field, field: meta.primaryKeys[0] }
29
- : field;
30
- });
31
- for (const p of ret) {
32
- if (!p.field.includes('.')) {
33
- continue;
34
- }
35
- const [f, ...parts] = p.field.split('.');
36
- p.field = f;
37
- p.children ??= [];
38
- const prop = meta.properties[p.field];
39
- if (parts[0] === PopulatePath.ALL) {
40
- prop
41
- .targetMeta.props.filter(prop => prop.lazy || prop.kind !== ReferenceKind.SCALAR)
42
- .forEach(prop => p.children.push({ field: prop.name, strategy: p.strategy }));
43
- }
44
- else if (prop.kind === ReferenceKind.EMBEDDED) {
45
- const embeddedProp = Object.values(prop.embeddedProps).find(c => c.embedded[1] === parts[0]);
46
- ret.push({
47
- ...p,
48
- field: embeddedProp.name,
49
- children: parts.length > 1 ? [expandNestedPopulate(embeddedProp, parts.slice(1), p.strategy, p.all)] : [],
50
- });
51
- p.children.push(expandNestedPopulate(prop, parts, p.strategy, p.all));
52
- }
53
- else {
54
- p.children.push(expandNestedPopulate(prop, parts, p.strategy, p.all));
20
+ const ret = normalized
21
+ ? populate
22
+ : Utils.asArray(populate).map(field => {
23
+ if (typeof field === 'string') {
24
+ return { field };
55
25
  }
26
+ /* v8 ignore next */
27
+ return typeof field === 'boolean' || field.field === PopulatePath.ALL
28
+ ? { all: !!field, field: meta.primaryKeys[0] }
29
+ : field;
30
+ });
31
+ for (const p of ret) {
32
+ if (!p.field.includes('.')) {
33
+ continue;
56
34
  }
57
- return ret;
35
+ const [f, ...parts] = p.field.split('.');
36
+ p.field = f;
37
+ p.children ??= [];
38
+ const prop = meta.properties[p.field];
39
+ if (parts[0] === PopulatePath.ALL) {
40
+ prop.targetMeta.props
41
+ .filter(prop => prop.lazy || prop.kind !== ReferenceKind.SCALAR)
42
+ .forEach(prop => p.children.push({ field: prop.name, strategy: p.strategy }));
43
+ } else if (prop.kind === ReferenceKind.EMBEDDED) {
44
+ const embeddedProp = Object.values(prop.embeddedProps).find(c => c.embedded[1] === parts[0]);
45
+ ret.push({
46
+ ...p,
47
+ field: embeddedProp.name,
48
+ children: parts.length > 1 ? [expandNestedPopulate(embeddedProp, parts.slice(1), p.strategy, p.all)] : [],
49
+ });
50
+ p.children.push(expandNestedPopulate(prop, parts, p.strategy, p.all));
51
+ } else {
52
+ p.children.push(expandNestedPopulate(prop, parts, p.strategy, p.all));
53
+ }
54
+ }
55
+ return ret;
58
56
  }
59
57
  /**
60
58
  * Returns the loading strategy based on the provided hint.
@@ -62,43 +60,43 @@ export function expandDotPaths(meta, populate, normalized = false) {
62
60
  * @internal
63
61
  */
64
62
  export function getLoadingStrategy(strategy, kind) {
65
- if (strategy === LoadStrategy.BALANCED) {
66
- return [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(kind)
67
- ? LoadStrategy.JOINED
68
- : LoadStrategy.SELECT_IN;
69
- }
70
- return strategy;
63
+ if (strategy === LoadStrategy.BALANCED) {
64
+ return [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(kind)
65
+ ? LoadStrategy.JOINED
66
+ : LoadStrategy.SELECT_IN;
67
+ }
68
+ return strategy;
71
69
  }
72
70
  function findPopulateEntry(populate, parts) {
73
- let current = populate;
74
- for (let i = 0; i < parts.length; i++) {
75
- const entry = current.find(p => p.field.split(':')[0] === parts[i]);
76
- if (!entry) {
77
- return undefined;
78
- }
79
- if (i === parts.length - 1) {
80
- return entry;
81
- }
82
- current = (entry.children ?? []);
71
+ let current = populate;
72
+ for (let i = 0; i < parts.length; i++) {
73
+ const entry = current.find(p => p.field.split(':')[0] === parts[i]);
74
+ if (!entry) {
75
+ return undefined;
76
+ }
77
+ if (i === parts.length - 1) {
78
+ return entry;
83
79
  }
84
- /* v8 ignore next */
85
- return undefined;
80
+ current = entry.children ?? [];
81
+ }
82
+ /* v8 ignore next */
83
+ return undefined;
86
84
  }
87
85
  /**
88
86
  * Applies per-relation overrides from `populateHints` to the normalized populate tree.
89
87
  * @internal
90
88
  */
91
89
  export function applyPopulateHints(populate, hints) {
92
- for (const [path, hint] of Object.entries(hints)) {
93
- const entry = findPopulateEntry(populate, path.split('.'));
94
- if (!entry) {
95
- continue;
96
- }
97
- if (hint.strategy != null) {
98
- entry.strategy = hint.strategy;
99
- }
100
- if (hint.joinType != null) {
101
- entry.joinType = hint.joinType;
102
- }
90
+ for (const [path, hint] of Object.entries(hints)) {
91
+ const entry = findPopulateEntry(populate, path.split('.'));
92
+ if (!entry) {
93
+ continue;
94
+ }
95
+ if (hint.strategy != null) {
96
+ entry.strategy = hint.strategy;
97
+ }
98
+ if (hint.joinType != null) {
99
+ entry.joinType = hint.joinType;
103
100
  }
101
+ }
104
102
  }
@@ -4,63 +4,63 @@ import { isRaw, Raw } from '../utils/RawQueryFragment.js';
4
4
  import { SCALAR_TYPES } from '../enums.js';
5
5
  /** @internal */
6
6
  export function validateProperty(prop, givenValue, entity) {
7
- if (givenValue == null || isRaw(givenValue)) {
8
- return;
9
- }
10
- const expectedType = prop.runtimeType;
11
- const propName = prop.embedded ? prop.name.replace(/~/g, '.') : prop.name;
12
- const givenType = Utils.getObjectType(givenValue);
13
- if (prop.enum && prop.items) {
14
- /* v8 ignore next */
15
- if (!prop.items.some(it => it === givenValue)) {
16
- throw ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
17
- }
7
+ if (givenValue == null || isRaw(givenValue)) {
8
+ return;
9
+ }
10
+ const expectedType = prop.runtimeType;
11
+ const propName = prop.embedded ? prop.name.replace(/~/g, '.') : prop.name;
12
+ const givenType = Utils.getObjectType(givenValue);
13
+ if (prop.enum && prop.items) {
14
+ /* v8 ignore next */
15
+ if (!prop.items.some(it => it === givenValue)) {
16
+ throw ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
18
17
  }
19
- else {
20
- if (givenType !== expectedType && SCALAR_TYPES.has(expectedType)) {
21
- throw ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
22
- }
18
+ } else {
19
+ if (givenType !== expectedType && SCALAR_TYPES.has(expectedType)) {
20
+ throw ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
23
21
  }
22
+ }
24
23
  }
25
24
  function getValue(o, prop) {
26
- if (prop.embedded && prop.embedded[0] in o) {
27
- return o[prop.embedded[0]]?.[prop.embedded[1]];
28
- }
29
- /* v8 ignore next */
30
- if (prop.ref) {
31
- return o[prop.name]?.unwrap();
32
- }
33
- return o[prop.name];
25
+ if (prop.embedded && prop.embedded[0] in o) {
26
+ return o[prop.embedded[0]]?.[prop.embedded[1]];
27
+ }
28
+ /* v8 ignore next */
29
+ if (prop.ref) {
30
+ return o[prop.name]?.unwrap();
31
+ }
32
+ return o[prop.name];
34
33
  }
35
34
  /** @internal */
36
35
  export function validateEntity(entity, meta) {
37
- for (const prop of meta.validateProps) {
38
- validateProperty(prop, getValue(entity, prop), entity);
39
- }
36
+ for (const prop of meta.validateProps) {
37
+ validateProperty(prop, getValue(entity, prop), entity);
38
+ }
40
39
  }
41
40
  /** @internal */
42
41
  export function validateParams(params, type = 'search condition', field) {
43
- if (Utils.isPrimaryKey(params) || Utils.isEntity(params)) {
44
- return;
45
- }
46
- if (Array.isArray(params)) {
47
- return params.forEach(item => validateParams(item, type, field));
48
- }
49
- if (Utils.isPlainObject(params)) {
50
- Object.keys(params).forEach(k => validateParams(params[k], type, k));
51
- }
42
+ if (Utils.isPrimaryKey(params) || Utils.isEntity(params)) {
43
+ return;
44
+ }
45
+ if (Array.isArray(params)) {
46
+ return params.forEach(item => validateParams(item, type, field));
47
+ }
48
+ if (Utils.isPlainObject(params)) {
49
+ Object.keys(params).forEach(k => validateParams(params[k], type, k));
50
+ }
52
51
  }
53
52
  /** @internal */
54
53
  export function validatePrimaryKey(entity, meta) {
55
- const pkExists = meta.primaryKeys.every(pk => entity[pk] != null) ||
56
- (meta.serializedPrimaryKey && entity[meta.serializedPrimaryKey] != null);
57
- if (!entity || !pkExists) {
58
- throw ValidationError.fromMergeWithoutPK(meta);
59
- }
54
+ const pkExists =
55
+ meta.primaryKeys.every(pk => entity[pk] != null) ||
56
+ (meta.serializedPrimaryKey && entity[meta.serializedPrimaryKey] != null);
57
+ if (!entity || !pkExists) {
58
+ throw ValidationError.fromMergeWithoutPK(meta);
59
+ }
60
60
  }
61
61
  /** @internal */
62
62
  export function validateEmptyWhere(where) {
63
- if (Utils.isEmpty(where) && !Raw.hasObjectFragments(where)) {
64
- throw new Error(`You cannot call 'EntityManager.findOne()' with empty 'where' parameter`);
65
- }
63
+ if (Utils.isEmpty(where) && !Raw.hasObjectFragments(where)) {
64
+ throw new Error(`You cannot call 'EntityManager.findOne()' with empty 'where' parameter`);
65
+ }
66
66
  }
package/entity/wrap.js CHANGED
@@ -3,13 +3,13 @@
3
3
  * use `preferHelper = true` to have access to the internal `__` properties like `__meta` or `__em`
4
4
  */
5
5
  export function wrap(entity, preferHelper = false) {
6
- if (!entity) {
7
- return entity;
8
- }
9
- if (entity.__baseEntity && !preferHelper) {
10
- return entity;
11
- }
12
- return entity.__helper ?? entity;
6
+ if (!entity) {
7
+ return entity;
8
+ }
9
+ if (entity.__baseEntity && !preferHelper) {
10
+ return entity;
11
+ }
12
+ return entity.__helper ?? entity;
13
13
  }
14
14
  /**
15
15
  * wraps entity type with WrappedEntity internal properties and helpers like init/isInitialized/populated/toJSON
@@ -17,5 +17,5 @@ export function wrap(entity, preferHelper = false) {
17
17
  * @internal
18
18
  */
19
19
  export function helper(entity) {
20
- return entity.__helper;
20
+ return entity.__helper;
21
21
  }