@mikro-orm/core 7.0.0-dev.12 → 7.0.0-dev.120

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 +85 -56
  2. package/EntityManager.js +332 -293
  3. package/MikroORM.d.ts +41 -32
  4. package/MikroORM.js +100 -140
  5. package/README.md +3 -2
  6. package/cache/FileCacheAdapter.d.ts +1 -1
  7. package/cache/FileCacheAdapter.js +8 -7
  8. package/cache/GeneratedCacheAdapter.d.ts +0 -1
  9. package/cache/GeneratedCacheAdapter.js +0 -2
  10. package/cache/index.d.ts +0 -1
  11. package/cache/index.js +0 -1
  12. package/connections/Connection.d.ts +16 -7
  13. package/connections/Connection.js +23 -14
  14. package/drivers/DatabaseDriver.d.ts +25 -16
  15. package/drivers/DatabaseDriver.js +35 -19
  16. package/drivers/IDatabaseDriver.d.ts +38 -17
  17. package/entity/BaseEntity.d.ts +0 -1
  18. package/entity/BaseEntity.js +0 -3
  19. package/entity/Collection.d.ts +95 -30
  20. package/entity/Collection.js +439 -99
  21. package/entity/EntityAssigner.d.ts +1 -1
  22. package/entity/EntityAssigner.js +26 -18
  23. package/entity/EntityFactory.d.ts +7 -0
  24. package/entity/EntityFactory.js +72 -53
  25. package/entity/EntityHelper.d.ts +2 -2
  26. package/entity/EntityHelper.js +30 -15
  27. package/entity/EntityLoader.d.ts +7 -6
  28. package/entity/EntityLoader.js +84 -72
  29. package/entity/EntityRepository.d.ts +1 -1
  30. package/entity/EntityRepository.js +2 -2
  31. package/entity/Reference.d.ts +6 -5
  32. package/entity/Reference.js +34 -9
  33. package/entity/WrappedEntity.d.ts +2 -7
  34. package/entity/WrappedEntity.js +3 -8
  35. package/entity/defineEntity.d.ts +568 -0
  36. package/entity/defineEntity.js +529 -0
  37. package/entity/index.d.ts +3 -2
  38. package/entity/index.js +3 -2
  39. package/entity/utils.d.ts +7 -0
  40. package/entity/utils.js +16 -4
  41. package/entity/validators.d.ts +11 -0
  42. package/entity/validators.js +65 -0
  43. package/enums.d.ts +21 -6
  44. package/enums.js +14 -1
  45. package/errors.d.ts +17 -9
  46. package/errors.js +41 -21
  47. package/events/EventManager.d.ts +2 -1
  48. package/events/EventManager.js +19 -11
  49. package/hydration/Hydrator.js +1 -2
  50. package/hydration/ObjectHydrator.d.ts +4 -4
  51. package/hydration/ObjectHydrator.js +50 -33
  52. package/index.d.ts +2 -2
  53. package/index.js +1 -2
  54. package/logging/DefaultLogger.d.ts +1 -1
  55. package/logging/DefaultLogger.js +1 -0
  56. package/logging/SimpleLogger.d.ts +1 -1
  57. package/logging/colors.d.ts +1 -1
  58. package/logging/colors.js +7 -6
  59. package/logging/index.d.ts +1 -0
  60. package/logging/index.js +1 -0
  61. package/logging/inspect.d.ts +2 -0
  62. package/logging/inspect.js +11 -0
  63. package/metadata/EntitySchema.d.ts +13 -17
  64. package/metadata/EntitySchema.js +67 -51
  65. package/metadata/MetadataDiscovery.d.ts +6 -10
  66. package/metadata/MetadataDiscovery.js +289 -298
  67. package/metadata/MetadataProvider.d.ts +11 -2
  68. package/metadata/MetadataProvider.js +46 -2
  69. package/metadata/MetadataStorage.d.ts +13 -11
  70. package/metadata/MetadataStorage.js +70 -37
  71. package/metadata/MetadataValidator.d.ts +2 -9
  72. package/metadata/MetadataValidator.js +22 -38
  73. package/metadata/discover-entities.d.ts +5 -0
  74. package/metadata/discover-entities.js +40 -0
  75. package/metadata/index.d.ts +1 -1
  76. package/metadata/index.js +1 -1
  77. package/metadata/types.d.ts +480 -0
  78. package/metadata/types.js +1 -0
  79. package/naming-strategy/AbstractNamingStrategy.d.ts +8 -4
  80. package/naming-strategy/AbstractNamingStrategy.js +8 -2
  81. package/naming-strategy/EntityCaseNamingStrategy.d.ts +3 -3
  82. package/naming-strategy/EntityCaseNamingStrategy.js +6 -5
  83. package/naming-strategy/MongoNamingStrategy.d.ts +3 -3
  84. package/naming-strategy/MongoNamingStrategy.js +6 -6
  85. package/naming-strategy/NamingStrategy.d.ts +14 -4
  86. package/naming-strategy/UnderscoreNamingStrategy.d.ts +3 -3
  87. package/naming-strategy/UnderscoreNamingStrategy.js +6 -6
  88. package/not-supported.d.ts +2 -0
  89. package/not-supported.js +4 -0
  90. package/package.json +19 -11
  91. package/platforms/ExceptionConverter.js +1 -1
  92. package/platforms/Platform.d.ts +6 -13
  93. package/platforms/Platform.js +17 -43
  94. package/serialization/EntitySerializer.d.ts +5 -0
  95. package/serialization/EntitySerializer.js +47 -27
  96. package/serialization/EntityTransformer.js +28 -18
  97. package/serialization/SerializationContext.d.ts +6 -6
  98. package/serialization/SerializationContext.js +16 -13
  99. package/types/ArrayType.d.ts +1 -1
  100. package/types/ArrayType.js +2 -3
  101. package/types/BigIntType.d.ts +8 -6
  102. package/types/BigIntType.js +1 -1
  103. package/types/BlobType.d.ts +0 -1
  104. package/types/BlobType.js +0 -3
  105. package/types/BooleanType.d.ts +2 -1
  106. package/types/BooleanType.js +3 -0
  107. package/types/DecimalType.d.ts +6 -4
  108. package/types/DecimalType.js +3 -3
  109. package/types/DoubleType.js +2 -2
  110. package/types/EnumArrayType.js +1 -2
  111. package/types/JsonType.d.ts +1 -1
  112. package/types/JsonType.js +7 -2
  113. package/types/TinyIntType.js +1 -1
  114. package/types/Type.d.ts +2 -4
  115. package/types/Type.js +3 -3
  116. package/types/Uint8ArrayType.d.ts +0 -1
  117. package/types/Uint8ArrayType.js +1 -4
  118. package/types/index.d.ts +1 -1
  119. package/typings.d.ts +124 -86
  120. package/typings.js +50 -42
  121. package/unit-of-work/ChangeSet.d.ts +2 -6
  122. package/unit-of-work/ChangeSet.js +4 -5
  123. package/unit-of-work/ChangeSetComputer.d.ts +1 -3
  124. package/unit-of-work/ChangeSetComputer.js +14 -12
  125. package/unit-of-work/ChangeSetPersister.d.ts +5 -4
  126. package/unit-of-work/ChangeSetPersister.js +65 -33
  127. package/unit-of-work/CommitOrderCalculator.d.ts +12 -10
  128. package/unit-of-work/CommitOrderCalculator.js +13 -13
  129. package/unit-of-work/UnitOfWork.d.ts +10 -3
  130. package/unit-of-work/UnitOfWork.js +139 -96
  131. package/utils/AbstractSchemaGenerator.d.ts +5 -5
  132. package/utils/AbstractSchemaGenerator.js +18 -16
  133. package/utils/AsyncContext.d.ts +6 -0
  134. package/utils/AsyncContext.js +42 -0
  135. package/utils/Configuration.d.ts +753 -207
  136. package/utils/Configuration.js +145 -190
  137. package/utils/ConfigurationLoader.d.ts +1 -54
  138. package/utils/ConfigurationLoader.js +1 -352
  139. package/utils/Cursor.d.ts +0 -3
  140. package/utils/Cursor.js +9 -6
  141. package/utils/DataloaderUtils.d.ts +15 -5
  142. package/utils/DataloaderUtils.js +65 -17
  143. package/utils/EntityComparator.d.ts +13 -9
  144. package/utils/EntityComparator.js +85 -43
  145. package/utils/QueryHelper.d.ts +14 -6
  146. package/utils/QueryHelper.js +87 -25
  147. package/utils/RawQueryFragment.d.ts +48 -25
  148. package/utils/RawQueryFragment.js +66 -70
  149. package/utils/RequestContext.js +2 -2
  150. package/utils/TransactionContext.js +2 -2
  151. package/utils/TransactionManager.d.ts +65 -0
  152. package/utils/TransactionManager.js +223 -0
  153. package/utils/Utils.d.ts +12 -119
  154. package/utils/Utils.js +97 -373
  155. package/utils/clone.js +8 -23
  156. package/utils/env-vars.d.ts +7 -0
  157. package/utils/env-vars.js +97 -0
  158. package/utils/fs-utils.d.ts +32 -0
  159. package/utils/fs-utils.js +178 -0
  160. package/utils/index.d.ts +2 -1
  161. package/utils/index.js +2 -1
  162. package/utils/upsert-utils.d.ts +9 -4
  163. package/utils/upsert-utils.js +55 -4
  164. package/decorators/Check.d.ts +0 -3
  165. package/decorators/Check.js +0 -13
  166. package/decorators/CreateRequestContext.d.ts +0 -3
  167. package/decorators/CreateRequestContext.js +0 -32
  168. package/decorators/Embeddable.d.ts +0 -8
  169. package/decorators/Embeddable.js +0 -11
  170. package/decorators/Embedded.d.ts +0 -18
  171. package/decorators/Embedded.js +0 -18
  172. package/decorators/Entity.d.ts +0 -18
  173. package/decorators/Entity.js +0 -12
  174. package/decorators/Enum.d.ts +0 -9
  175. package/decorators/Enum.js +0 -16
  176. package/decorators/Filter.d.ts +0 -2
  177. package/decorators/Filter.js +0 -8
  178. package/decorators/Formula.d.ts +0 -4
  179. package/decorators/Formula.js +0 -15
  180. package/decorators/Indexed.d.ts +0 -19
  181. package/decorators/Indexed.js +0 -20
  182. package/decorators/ManyToMany.d.ts +0 -40
  183. package/decorators/ManyToMany.js +0 -14
  184. package/decorators/ManyToOne.d.ts +0 -30
  185. package/decorators/ManyToOne.js +0 -14
  186. package/decorators/OneToMany.d.ts +0 -28
  187. package/decorators/OneToMany.js +0 -17
  188. package/decorators/OneToOne.d.ts +0 -24
  189. package/decorators/OneToOne.js +0 -7
  190. package/decorators/PrimaryKey.d.ts +0 -8
  191. package/decorators/PrimaryKey.js +0 -20
  192. package/decorators/Property.d.ts +0 -250
  193. package/decorators/Property.js +0 -32
  194. package/decorators/Transactional.d.ts +0 -13
  195. package/decorators/Transactional.js +0 -28
  196. package/decorators/hooks.d.ts +0 -16
  197. package/decorators/hooks.js +0 -47
  198. package/decorators/index.d.ts +0 -17
  199. package/decorators/index.js +0 -17
  200. package/entity/ArrayCollection.d.ts +0 -116
  201. package/entity/ArrayCollection.js +0 -402
  202. package/entity/EntityValidator.d.ts +0 -19
  203. package/entity/EntityValidator.js +0 -150
  204. package/metadata/ReflectMetadataProvider.d.ts +0 -8
  205. package/metadata/ReflectMetadataProvider.js +0 -44
  206. package/utils/resolveContextProvider.d.ts +0 -10
  207. package/utils/resolveContextProvider.js +0 -28
package/utils/Utils.js CHANGED
@@ -1,15 +1,7 @@
1
- import { createRequire } from 'node:module';
2
- import globby from 'globby';
3
- import { extname, isAbsolute, join, normalize, relative, resolve } from 'node:path';
4
- import { platform } from 'node:os';
5
- import { fileURLToPath, pathToFileURL } from 'node:url';
6
- import { existsSync, mkdirSync, readFileSync } from 'node:fs';
7
- import { createHash } from 'node:crypto';
8
- import { tokenize } from 'esprima';
9
1
  import { clone } from './clone.js';
10
- import { ARRAY_OPERATORS, JSON_KEY_OPERATORS, GroupOperator, PlainObject, QueryOperator, ReferenceKind } from '../enums.js';
2
+ import { GroupOperator, PlainObject, QueryOperator, ReferenceKind } from '../enums.js';
11
3
  import { helper } from '../entity/wrap.js';
12
- export const ObjectBindingPattern = Symbol('ObjectBindingPattern');
4
+ import { Raw } from './RawQueryFragment.js';
13
5
  function compareConstructors(a, b) {
14
6
  if (a.constructor === b.constructor) {
15
7
  return true;
@@ -41,9 +33,8 @@ export function compareObjects(a, b) {
41
33
  }
42
34
  return timeA === timeB;
43
35
  }
44
- /* v8 ignore next 9 */
36
+ /* v8 ignore next */
45
37
  if ((typeof a === 'function' && typeof b === 'function') ||
46
- (typeof a === 'object' && a.client && ['Ref', 'Raw'].includes(a.constructor.name) && typeof b === 'object' && b.client && ['Ref', 'Raw'].includes(b.constructor.name)) || // knex qb
47
38
  (a instanceof RegExp && b instanceof RegExp) ||
48
39
  (a instanceof String && b instanceof String) ||
49
40
  (a instanceof Number && b instanceof Number)) {
@@ -119,7 +110,7 @@ export function equals(a, b) {
119
110
  const equalsFn = equals;
120
111
  export function parseJsonSafe(value) {
121
112
  if (typeof value === 'string') {
122
- /* v8 ignore next 6 */
113
+ /* v8 ignore next */
123
114
  try {
124
115
  return JSON.parse(value);
125
116
  }
@@ -132,52 +123,13 @@ export function parseJsonSafe(value) {
132
123
  }
133
124
  export class Utils {
134
125
  static PK_SEPARATOR = '~~~';
135
- /* v8 ignore next */
136
- static dynamicImportProvider = (id) => import(id);
137
- /**
138
- * Checks if the argument is not undefined
139
- */
140
- static isDefined(data) {
141
- return typeof data !== 'undefined';
142
- }
126
+ static #ORM_VERSION = '7.0.0-dev.120';
143
127
  /**
144
128
  * Checks if the argument is instance of `Object`. Returns false for arrays.
145
129
  */
146
130
  static isObject(o) {
147
131
  return !!o && typeof o === 'object' && !Array.isArray(o);
148
132
  }
149
- /**
150
- * Relation decorators allow using two signatures
151
- * - using first parameter as options object
152
- * - using all parameters
153
- *
154
- * This function validates those two ways are not mixed and returns the final options object.
155
- * If the second way is used, we always consider the last parameter as options object.
156
- * @internal
157
- */
158
- static processDecoratorParameters(params) {
159
- const keys = Object.keys(params);
160
- const values = Object.values(params);
161
- if (!Utils.isPlainObject(values[0])) {
162
- const lastKey = keys[keys.length - 1];
163
- const last = params[lastKey];
164
- delete params[lastKey];
165
- return { ...last, ...params };
166
- }
167
- // validate only first parameter is used if its an option object
168
- const empty = (v) => v == null || (Utils.isPlainObject(v) && !Utils.hasObjectKeys(v));
169
- if (values.slice(1).some(v => !empty(v))) {
170
- throw new Error('Mixing first decorator parameter as options object with other parameters is forbidden. ' +
171
- 'If you want to use the options parameter at first position, provide all options inside it.');
172
- }
173
- return values[0];
174
- }
175
- /**
176
- * Checks if the argument is instance of `Object`, but not one of the blacklisted types. Returns false for arrays.
177
- */
178
- static isNotObject(o, not) {
179
- return this.isObject(o) && !not.some(cls => o instanceof cls);
180
- }
181
133
  /**
182
134
  * Removes `undefined` properties (recursively) so they are not saved as nulls
183
135
  */
@@ -225,18 +177,6 @@ export class Utils {
225
177
  }
226
178
  return false;
227
179
  }
228
- /**
229
- * Checks if the argument is string
230
- */
231
- static isString(s) {
232
- return typeof s === 'string';
233
- }
234
- /**
235
- * Checks if the argument is number
236
- */
237
- static isNumber(s) {
238
- return typeof s === 'number';
239
- }
240
180
  /**
241
181
  * Checks if arguments are deeply (but not strictly) equal.
242
182
  */
@@ -282,7 +222,7 @@ export class Utils {
282
222
  target[key] = Utils.copy(value);
283
223
  continue;
284
224
  }
285
- /* v8 ignore next 3 */
225
+ /* v8 ignore next */
286
226
  if (!(key in target)) {
287
227
  Object.assign(target, { [key]: {} });
288
228
  }
@@ -295,30 +235,6 @@ export class Utils {
295
235
  }
296
236
  return Utils._merge(target, sources, ignoreUndefined);
297
237
  }
298
- static getRootEntity(metadata, meta) {
299
- const base = meta.extends && metadata.find(Utils.className(meta.extends));
300
- if (!base || base === meta) { // make sure we do not fall into infinite loop
301
- return meta;
302
- }
303
- const root = Utils.getRootEntity(metadata, base);
304
- if (root.discriminatorColumn) {
305
- return root;
306
- }
307
- return meta;
308
- }
309
- /**
310
- * Computes difference between two objects, ignoring items missing in `b`.
311
- */
312
- static diff(a, b) {
313
- const ret = {};
314
- for (const k of Object.keys(b)) {
315
- if (Utils.equals(a[k], b[k])) {
316
- continue;
317
- }
318
- ret[k] = b[k];
319
- }
320
- return ret;
321
- }
322
238
  /**
323
239
  * Creates deep copy of given object.
324
240
  */
@@ -359,53 +275,37 @@ export class Utils {
359
275
  }
360
276
  }
361
277
  /**
362
- * Returns array of functions argument names. Uses `esprima` for source code analysis.
278
+ * Returns array of functions argument names. Uses basic regex for source code analysis, might not work with advanced syntax.
363
279
  */
364
- static tokenize(func) {
365
- if (Array.isArray(func)) {
366
- return func;
367
- }
368
- /* v8 ignore next 5 */
369
- try {
370
- return tokenize(func.toString(), { tolerant: true });
280
+ static getConstructorParams(func) {
281
+ const source = func.toString();
282
+ const i = source.indexOf('constructor');
283
+ if (i === -1) {
284
+ return undefined;
371
285
  }
372
- catch {
373
- return [];
286
+ const start = source.indexOf('(', i);
287
+ if (start === -1) {
288
+ return undefined;
374
289
  }
375
- }
376
- /**
377
- * Returns array of functions argument names. Uses `esprima` for source code analysis.
378
- */
379
- static getParamNames(func, methodName) {
380
- const ret = [];
381
- const tokens = this.tokenize(func);
382
- let inside = 0;
383
- let currentBlockStart = 0;
384
- for (let i = 0; i < tokens.length; i++) {
385
- const token = tokens[i];
386
- if (token.type === 'Identifier' && token.value === methodName) {
387
- inside = 1;
388
- currentBlockStart = i;
389
- continue;
290
+ let depth = 0;
291
+ let end = start;
292
+ for (; end < source.length; end++) {
293
+ if (source[end] === '(') {
294
+ depth++;
390
295
  }
391
- if (inside === 1 && token.type === 'Punctuator' && token.value === '(') {
392
- inside = 2;
393
- currentBlockStart = i;
394
- continue;
296
+ if (source[end] === ')') {
297
+ depth--;
395
298
  }
396
- if (inside === 2 && token.type === 'Punctuator' && token.value === ')') {
299
+ if (depth === 0) {
397
300
  break;
398
301
  }
399
- if (inside === 2 && token.type === 'Punctuator' && token.value === '{' && i === currentBlockStart + 1) {
400
- ret.push(ObjectBindingPattern);
401
- i = tokens.findIndex((t, idx) => idx > i + 2 && t.type === 'Punctuator' && t.value === '}');
402
- continue;
403
- }
404
- if (inside === 2 && token.type === 'Identifier') {
405
- ret.push(token.value);
406
- }
407
302
  }
408
- return ret;
303
+ const raw = source.slice(start + 1, end);
304
+ return raw
305
+ .split(',')
306
+ .map(s => s.trim().replace(/=.*$/, '').trim())
307
+ .filter(Boolean)
308
+ .map(raw => raw.startsWith('{') && raw.endsWith('}') ? '' : raw);
409
309
  }
410
310
  /**
411
311
  * Checks whether the argument looks like primary key (string, number or ObjectId).
@@ -418,7 +318,7 @@ export class Utils {
418
318
  return true;
419
319
  }
420
320
  if (Utils.isObject(key)) {
421
- if (key.constructor && key.constructor.name.toLowerCase() === 'objectid') {
321
+ if (key.constructor?.name === 'ObjectId') {
422
322
  return true;
423
323
  }
424
324
  if (!Utils.isPlainObject(key) && !Utils.isEntity(key, true)) {
@@ -435,7 +335,11 @@ export class Utils {
435
335
  return data;
436
336
  }
437
337
  if (Utils.isEntity(data, true)) {
438
- return helper(data).getPrimaryKey();
338
+ const wrapped = helper(data);
339
+ if (wrapped.__meta.compositePK) {
340
+ return wrapped.getPrimaryKeys();
341
+ }
342
+ return wrapped.getPrimaryKey();
439
343
  }
440
344
  if (strict && meta && Utils.getObjectKeysSize(data) !== meta.primaryKeys.length) {
441
345
  return null;
@@ -444,7 +348,7 @@ export class Utils {
444
348
  if (meta.compositePK) {
445
349
  return this.getCompositeKeyValue(data, meta);
446
350
  }
447
- return data[meta.primaryKeys[0]] || data[meta.serializedPrimaryKey] || null;
351
+ return data[meta.primaryKeys[0]] ?? data[meta.serializedPrimaryKey] ?? null;
448
352
  }
449
353
  return null;
450
354
  }
@@ -483,8 +387,8 @@ export class Utils {
483
387
  static splitPrimaryKeys(key) {
484
388
  return key.split(this.PK_SEPARATOR);
485
389
  }
486
- static getPrimaryKeyValues(entity, primaryKeys, allowScalar = false, convertCustomTypes = false) {
487
- /* v8 ignore next 3 */
390
+ static getPrimaryKeyValues(entity, meta, allowScalar = false, convertCustomTypes = false) {
391
+ /* v8 ignore next */
488
392
  if (entity == null) {
489
393
  return entity;
490
394
  }
@@ -494,15 +398,28 @@ export class Utils {
494
398
  }
495
399
  return val;
496
400
  }
497
- const pk = Utils.isEntity(entity, true)
498
- ? helper(entity).getPrimaryKey(convertCustomTypes)
499
- : primaryKeys.reduce((o, pk) => { o[pk] = entity[pk]; return o; }, {});
500
- if (primaryKeys.length > 1) {
401
+ let pk;
402
+ if (Utils.isEntity(entity, true)) {
403
+ pk = helper(entity).getPrimaryKey(convertCustomTypes);
404
+ }
405
+ else {
406
+ pk = meta.primaryKeys.reduce((o, pk) => {
407
+ const targetMeta = meta.properties[pk].targetMeta;
408
+ if (targetMeta && Utils.isPlainObject(entity[pk])) {
409
+ o[pk] = Utils.getPrimaryKeyValues(entity[pk], targetMeta, allowScalar, convertCustomTypes);
410
+ }
411
+ else {
412
+ o[pk] = entity[pk];
413
+ }
414
+ return o;
415
+ }, {});
416
+ }
417
+ if (meta.primaryKeys.length > 1) {
501
418
  return toArray(pk);
502
419
  }
503
420
  if (allowScalar) {
504
421
  if (Utils.isPlainObject(pk)) {
505
- return pk[primaryKeys[0]];
422
+ return pk[(meta.primaryKeys)[0]];
506
423
  }
507
424
  return pk;
508
425
  }
@@ -546,7 +463,7 @@ export class Utils {
546
463
  return o;
547
464
  }, {});
548
465
  }
549
- static getOrderedPrimaryKeys(id, meta, platform, convertCustomTypes = false) {
466
+ static getOrderedPrimaryKeys(id, meta, platform, convertCustomTypes = false, allowScalar = false) {
550
467
  const data = (Utils.isPrimaryKey(id) ? { [meta.primaryKeys[0]]: id } : id);
551
468
  const pks = meta.primaryKeys.map((pk, idx) => {
552
469
  const prop = meta.properties[pk];
@@ -556,11 +473,14 @@ export class Utils {
556
473
  value = prop.customType.convertToJSValue(value, platform);
557
474
  }
558
475
  if (prop.kind !== ReferenceKind.SCALAR && prop.targetMeta) {
559
- const value2 = this.getOrderedPrimaryKeys(value, prop.targetMeta, platform, convertCustomTypes);
476
+ const value2 = this.getOrderedPrimaryKeys(value, prop.targetMeta, platform, convertCustomTypes, allowScalar);
560
477
  value = value2.length > 1 ? value2 : value2[0];
561
478
  }
562
479
  return value;
563
480
  });
481
+ if (allowScalar && pks.length === 1) {
482
+ return pks[0];
483
+ }
564
484
  // we need to flatten the PKs as composite PKs can be build from another composite PKs
565
485
  // and this method is used to get the PK hash in identity map, that expects flat array
566
486
  return Utils.flatten(pks);
@@ -583,12 +503,6 @@ export class Utils {
583
503
  static isScalarReference(data, allowReference = false) {
584
504
  return typeof data === 'object' && data?.__scalarReference;
585
505
  }
586
- /**
587
- * Checks whether the argument is ObjectId instance
588
- */
589
- static isObjectID(key) {
590
- return Utils.isObject(key) && key.constructor && key.constructor.name.toLowerCase() === 'objectid';
591
- }
592
506
  /**
593
507
  * Checks whether the argument is empty (array without items, object without keys or falsy value).
594
508
  */
@@ -619,56 +533,21 @@ export class Utils {
619
533
  * Tries to detect TypeScript support.
620
534
  */
621
535
  static detectTypeScriptSupport() {
622
- /* v8 ignore next 7 */
536
+ /* v8 ignore next */
537
+ const process = globalThis.process ?? {};
538
+ /* v8 ignore next */
623
539
  return process.argv[0].endsWith('ts-node') // running via ts-node directly
624
- || !!process.env.MIKRO_ORM_CLI_ALWAYS_ALLOW_TS // forced explicitly or enabled via `registerTypeScriptSupport()`
625
- || !!process.env.TS_JEST // check if ts-jest is used (works only with v27.0.4+)
626
- || !!process.env.VITEST // check if vitest is used
627
- || !!process.versions.bun // check if bun is used
628
- || process.argv.slice(1).some(arg => arg.match(/\.([mc]?ts|tsx)$/)) // executing `.ts` file
629
- || process.execArgv.some(arg => {
540
+ || !!process.env?.MIKRO_ORM_CLI_ALWAYS_ALLOW_TS // forced explicitly or enabled via `registerTypeScriptSupport()`
541
+ || !!process.env?.TS_JEST // check if ts-jest is used
542
+ || !!process.env?.VITEST // check if vitest is used
543
+ || !!process.versions?.bun // check if bun is used
544
+ || process.argv?.slice(1).some(arg => arg.match(/\.([mc]?ts|tsx)$/)) // executing `.ts` file
545
+ || process.execArgv?.some(arg => {
630
546
  return arg.includes('ts-node') // check for ts-node loader
631
547
  || arg.includes('@swc-node/register') // check for swc-node/register loader
632
548
  || arg.includes('node_modules/tsx/'); // check for tsx loader
633
549
  });
634
550
  }
635
- /**
636
- * Uses some dark magic to get source path to caller where decorator is used.
637
- * Analyses stack trace of error created inside the function call.
638
- */
639
- static lookupPathFromDecorator(name, stack) {
640
- // use some dark magic to get source path to caller
641
- stack = stack || new Error().stack.split('\n');
642
- // In some situations (e.g. swc 1.3.4+), the presence of a source map can obscure the call to
643
- // __decorate(), replacing it with the constructor name. To support these cases we look for
644
- // Reflect.decorate() as well. Also when babel is used, we need to check
645
- // the `_applyDecoratedDescriptor` method instead.
646
- let line = stack.findIndex(line => line.match(/__decorate|Reflect\.decorate|_applyDecoratedDescriptor/));
647
- // bun does not have those lines at all, only the DecorateProperty/DecorateConstructor,
648
- // but those are also present in node, so we need to check this only if they weren't found.
649
- if (line === -1) {
650
- // here we handle bun which stack is different from nodejs so we search for reflect-metadata
651
- // Different bun versions might have different stack traces. The "last index" works for both 1.2.6 and 1.2.7.
652
- const reflectLine = stack.findLastIndex(line => Utils.normalizePath(line).includes('node_modules/reflect-metadata/Reflect.js'));
653
- if (reflectLine === -1 || reflectLine + 2 >= stack.length || !stack[reflectLine + 1].includes('bun:wrap')) {
654
- return name;
655
- }
656
- line = reflectLine + 2;
657
- }
658
- if (stack[line].includes('Reflect.decorate')) {
659
- line++;
660
- }
661
- if (Utils.normalizePath(stack[line]).includes('node_modules/tslib/tslib')) {
662
- line++;
663
- }
664
- try {
665
- const re = stack[line].match(/\(.+\)/i) ? /\((.*):\d+:\d+\)/ : /at\s*(.*):\d+:\d+$/;
666
- return Utils.normalizePath(stack[line].match(re)[1]);
667
- }
668
- catch {
669
- return name;
670
- }
671
- }
672
551
  /**
673
552
  * Gets the type of the argument.
674
553
  */
@@ -678,11 +557,11 @@ export class Utils {
678
557
  return simple;
679
558
  }
680
559
  const objectType = Object.prototype.toString.call(value);
681
- const type = objectType.match(/\[object (\w+)]/)[1];
560
+ const type = objectType.match(/^\[object (.+)]$/)[1];
682
561
  if (type === 'Uint8Array') {
683
562
  return 'Buffer';
684
563
  }
685
- return ['Date', 'Buffer', 'RegExp'].includes(type) ? type : type.toLowerCase();
564
+ return type;
686
565
  }
687
566
  /**
688
567
  * Checks whether the value is POJO (e.g. `{ foo: 'bar' }`, and not instance of `Foo`)
@@ -708,66 +587,14 @@ export class Utils {
708
587
  static isCollection(item) {
709
588
  return item?.__collection;
710
589
  }
711
- static fileURLToPath(url) {
712
- // expose `fileURLToPath` on Utils so that it can be properly mocked in tests
713
- return fileURLToPath(url);
714
- }
715
- /**
716
- * Resolves and normalizes a series of path parts relative to each preceding part.
717
- * If any part is a `file:` URL, it is converted to a local path. If any part is an
718
- * absolute path, it replaces preceding paths (similar to `path.resolve` in NodeJS).
719
- * Trailing directory separators are removed, and all directory separators are converted
720
- * to POSIX-style separators (`/`).
721
- */
722
- static normalizePath(...parts) {
723
- let start = 0;
724
- for (let i = 0; i < parts.length; i++) {
725
- const part = parts[i];
726
- if (isAbsolute(part)) {
727
- start = i;
728
- }
729
- else if (part.startsWith('file:')) {
730
- start = i;
731
- parts[i] = Utils.fileURLToPath(part);
732
- }
733
- }
734
- if (start > 0) {
735
- parts = parts.slice(start);
736
- }
737
- let path = parts.join('/').replace(/\\/g, '/').replace(/\/$/, '');
738
- path = normalize(path).replace(/\\/g, '/');
739
- return (path.match(/^[/.]|[a-zA-Z]:/) || path.startsWith('!')) ? path : './' + path;
740
- }
741
- /**
742
- * Determines the relative path between two paths. If either path is a `file:` URL,
743
- * it is converted to a local path.
744
- */
745
- static relativePath(path, relativeTo) {
746
- if (!path) {
747
- return path;
748
- }
749
- path = Utils.normalizePath(path);
750
- if (path.startsWith('.')) {
751
- return path;
752
- }
753
- path = relative(Utils.normalizePath(relativeTo), path);
754
- return Utils.normalizePath(path);
755
- }
756
- /**
757
- * Computes the absolute path to for the given path relative to the provided base directory.
758
- * If either `path` or `baseDir` are `file:` URLs, they are converted to local paths.
759
- */
760
- static absolutePath(path, baseDir = process.cwd()) {
761
- if (!path) {
762
- return Utils.normalizePath(baseDir);
763
- }
764
- if (!isAbsolute(path) && !path.startsWith('file://')) {
765
- path = baseDir + '/' + path;
766
- }
767
- return Utils.normalizePath(path);
768
- }
590
+ // FNV-1a 64-bit
769
591
  static hash(data, length) {
770
- const hash = createHash('md5').update(data).digest('hex');
592
+ let h1 = 0xcbf29ce484222325n;
593
+ for (let i = 0; i < data.length; i++) {
594
+ h1 ^= BigInt(data.charCodeAt(i));
595
+ h1 = (h1 * 0x100000001b3n) & 0xffffffffffffffffn;
596
+ }
597
+ const hash = h1.toString(16).padStart(16, '0');
771
598
  if (length) {
772
599
  return hash.substring(0, length);
773
600
  }
@@ -799,13 +626,6 @@ export class Utils {
799
626
  static randomInt(min, max) {
800
627
  return Math.round(Math.random() * (max - min)) + min;
801
628
  }
802
- static async pathExists(path, options = {}) {
803
- if (globby.hasMagic(path)) {
804
- const found = await globby(path, options);
805
- return found.length > 0;
806
- }
807
- return this.pathExistsSync(path);
808
- }
809
629
  /**
810
630
  * Extracts all possible values of a TS enum. Works with both string and numeric enums.
811
631
  */
@@ -831,15 +651,6 @@ export class Utils {
831
651
  }
832
652
  return key in GroupOperator || key in QueryOperator;
833
653
  }
834
- static isGroupOperator(key) {
835
- return key in GroupOperator;
836
- }
837
- static isArrayOperator(key) {
838
- return ARRAY_OPERATORS.includes(key);
839
- }
840
- static isJsonKeyOperator(key) {
841
- return JSON_KEY_OPERATORS.includes(key);
842
- }
843
654
  static hasNestedKey(object, key) {
844
655
  if (!object) {
845
656
  return false;
@@ -852,66 +663,13 @@ export class Utils {
852
663
  }
853
664
  return false;
854
665
  }
855
- static getGlobalStorage(namespace) {
856
- const key = `mikro-orm-${namespace}`;
857
- globalThis[key] = globalThis[key] || {};
858
- return globalThis[key];
859
- }
860
- /**
861
- * Require a module from a specific location
862
- * @param id The module to require
863
- * @param [from] Location to start the node resolution
864
- */
865
- static requireFrom(id, from = process.cwd()) {
866
- if (!extname(from)) {
867
- from = join(from, '__fake.js');
868
- }
869
- return createRequire(resolve(from))(id);
870
- }
871
- static async dynamicImport(id) {
872
- /* v8 ignore next 7 */
873
- if (platform() === 'win32') {
874
- try {
875
- id = pathToFileURL(id).toString();
876
- }
877
- catch {
878
- // ignore
879
- }
880
- }
881
- /* v8 ignore next */
882
- return this.dynamicImportProvider(id);
883
- }
884
- /* v8 ignore next 3 */
885
- static setDynamicImportProvider(provider) {
886
- this.dynamicImportProvider = provider;
887
- }
888
- static ensureDir(path) {
889
- if (!existsSync(path)) {
890
- mkdirSync(path, { recursive: true });
891
- }
892
- }
893
- static pathExistsSync(path) {
894
- return existsSync(path);
895
- }
896
- static readJSONSync(path) {
897
- const file = readFileSync(path);
898
- return JSON.parse(file.toString());
899
- }
900
666
  static getORMVersion() {
901
- try {
902
- // this works during development where we have `src` folder
903
- return this.requireFrom('../../package.json', import.meta.dirname).version;
904
- /* v8 ignore next 5 */
905
- }
906
- catch {
907
- // this works in production build where we do not have the `src` folder
908
- return this.requireFrom('../package.json', import.meta.dirname).version;
909
- }
667
+ return this.#ORM_VERSION;
910
668
  }
911
669
  static createFunction(context, code) {
912
670
  try {
913
671
  return new Function(...context.keys(), `'use strict';\n` + code)(...context.values());
914
- /* v8 ignore next 5 */
672
+ /* v8 ignore next */
915
673
  }
916
674
  catch (e) {
917
675
  // eslint-disable-next-line no-console
@@ -924,7 +682,7 @@ export class Utils {
924
682
  return fn(...args);
925
683
  }
926
684
  catch (e) {
927
- /* v8 ignore start */
685
+ /* v8 ignore next */
928
686
  if ([SyntaxError, TypeError, EvalError, ReferenceError].some(t => e instanceof t)) {
929
687
  const position = e.stack.match(/<anonymous>:(\d+):(\d+)/);
930
688
  let code = fn.toString();
@@ -941,18 +699,9 @@ export class Utils {
941
699
  // eslint-disable-next-line no-console
942
700
  console.error(`JIT runtime error: ${e.message}\n\n${code}`);
943
701
  }
944
- /* v8 ignore stop */
945
702
  throw e;
946
703
  }
947
704
  }
948
- /**
949
- * @see https://github.com/mikro-orm/mikro-orm/issues/840
950
- */
951
- static propertyDecoratorReturnValue() {
952
- if (process.env.BABEL_DECORATORS_COMPAT) {
953
- return {};
954
- }
955
- }
956
705
  static unwrapProperty(entity, meta, prop, payload = false) {
957
706
  let p = prop;
958
707
  const path = [];
@@ -1032,54 +781,21 @@ export class Utils {
1032
781
  }
1033
782
  }
1034
783
  }
1035
- static tryRequire({ module, from, allowError, warning }) {
1036
- allowError ??= `Cannot find module '${module}'`;
1037
- from ??= process.cwd();
784
+ static async tryImport({ module, warning }) {
1038
785
  try {
1039
- return Utils.requireFrom(module, from);
786
+ return await import(module);
1040
787
  }
1041
788
  catch (err) {
1042
- if (err.message.includes(allowError)) {
1043
- // eslint-disable-next-line no-console
1044
- console.warn(warning);
789
+ if (err.code === 'ERR_MODULE_NOT_FOUND') {
790
+ if (warning) {
791
+ // eslint-disable-next-line no-console
792
+ console.warn(warning);
793
+ }
1045
794
  return undefined;
1046
795
  }
1047
796
  throw err;
1048
797
  }
1049
798
  }
1050
- static async tryImport({ module, warning }) {
1051
- try {
1052
- return await this.dynamicImport(module);
1053
- }
1054
- catch (err) {
1055
- // eslint-disable-next-line no-console
1056
- console.warn(warning);
1057
- return undefined;
1058
- }
1059
- }
1060
- static stripRelativePath(str) {
1061
- return str.replace(/^(?:\.\.\/|\.\/)+/, '/');
1062
- }
1063
- /**
1064
- * simple process.argv parser, supports only properties with long names, prefixed with `--`
1065
- */
1066
- static parseArgs() {
1067
- let lastKey;
1068
- return process.argv.slice(2).reduce((args, arg) => {
1069
- if (arg.includes('=')) {
1070
- const [key, value] = arg.split('=');
1071
- args[key.substring(2)] = value;
1072
- }
1073
- else if (lastKey) {
1074
- args[lastKey] = arg;
1075
- lastKey = undefined;
1076
- }
1077
- else if (arg.startsWith('--')) {
1078
- lastKey = arg.substring(2);
1079
- }
1080
- return args;
1081
- }, {});
1082
- }
1083
799
  static xor(a, b) {
1084
800
  return (a || b) && !(a && b);
1085
801
  }
@@ -1108,4 +824,12 @@ export class Utils {
1108
824
  return o;
1109
825
  }, {});
1110
826
  }
827
+ static getObjectQueryKeys(obj) {
828
+ return Reflect.ownKeys(obj).filter(key => {
829
+ if (!Object.prototype.propertyIsEnumerable.call(obj, key)) {
830
+ return false;
831
+ }
832
+ return typeof key === 'string' || Raw.isKnownFragmentSymbol(key);
833
+ });
834
+ }
1111
835
  }