@mikro-orm/core 7.0.0-dev.8 → 7.0.0-dev.81
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.
- package/EntityManager.d.ts +85 -48
- package/EntityManager.js +300 -225
- package/MikroORM.d.ts +40 -31
- package/MikroORM.js +98 -137
- package/README.md +3 -2
- package/cache/FileCacheAdapter.d.ts +1 -1
- package/cache/FileCacheAdapter.js +6 -5
- package/cache/GeneratedCacheAdapter.d.ts +0 -1
- package/cache/GeneratedCacheAdapter.js +0 -2
- package/cache/index.d.ts +0 -1
- package/cache/index.js +0 -1
- package/connections/Connection.d.ts +11 -7
- package/connections/Connection.js +16 -14
- package/drivers/DatabaseDriver.d.ts +11 -5
- package/drivers/DatabaseDriver.js +23 -11
- package/drivers/IDatabaseDriver.d.ts +27 -5
- package/entity/BaseEntity.d.ts +0 -1
- package/entity/BaseEntity.js +0 -3
- package/entity/Collection.d.ts +98 -30
- package/entity/Collection.js +432 -93
- package/entity/EntityAssigner.d.ts +1 -1
- package/entity/EntityAssigner.js +15 -7
- package/entity/EntityFactory.d.ts +7 -0
- package/entity/EntityFactory.js +64 -41
- package/entity/EntityHelper.js +26 -9
- package/entity/EntityLoader.d.ts +5 -4
- package/entity/EntityLoader.js +73 -40
- package/entity/EntityRepository.d.ts +1 -1
- package/entity/Reference.d.ts +9 -7
- package/entity/Reference.js +33 -6
- package/entity/WrappedEntity.d.ts +2 -4
- package/entity/WrappedEntity.js +1 -5
- package/entity/defineEntity.d.ts +549 -0
- package/entity/defineEntity.js +529 -0
- package/entity/index.d.ts +3 -2
- package/entity/index.js +3 -2
- package/entity/utils.d.ts +7 -0
- package/entity/utils.js +16 -4
- package/entity/validators.d.ts +11 -0
- package/entity/validators.js +65 -0
- package/enums.d.ts +21 -6
- package/enums.js +14 -1
- package/errors.d.ts +6 -2
- package/errors.js +14 -9
- package/events/EventSubscriber.d.ts +3 -1
- package/hydration/Hydrator.js +1 -2
- package/hydration/ObjectHydrator.d.ts +4 -4
- package/hydration/ObjectHydrator.js +36 -25
- package/index.d.ts +2 -2
- package/index.js +1 -2
- package/logging/DefaultLogger.d.ts +1 -1
- package/logging/SimpleLogger.d.ts +1 -1
- package/metadata/EntitySchema.d.ts +9 -13
- package/metadata/EntitySchema.js +44 -26
- package/metadata/MetadataDiscovery.d.ts +6 -9
- package/metadata/MetadataDiscovery.js +167 -206
- package/metadata/MetadataProvider.d.ts +11 -2
- package/metadata/MetadataProvider.js +44 -2
- package/metadata/MetadataStorage.d.ts +1 -6
- package/metadata/MetadataStorage.js +6 -18
- package/metadata/MetadataValidator.d.ts +0 -7
- package/metadata/MetadataValidator.js +4 -13
- package/metadata/discover-entities.d.ts +5 -0
- package/metadata/discover-entities.js +40 -0
- package/metadata/index.d.ts +1 -1
- package/metadata/index.js +1 -1
- package/metadata/types.d.ts +480 -0
- package/metadata/types.js +1 -0
- package/naming-strategy/AbstractNamingStrategy.d.ts +5 -1
- package/naming-strategy/AbstractNamingStrategy.js +8 -2
- package/naming-strategy/NamingStrategy.d.ts +11 -1
- package/not-supported.d.ts +2 -0
- package/not-supported.js +4 -0
- package/package.json +18 -10
- package/platforms/ExceptionConverter.js +1 -1
- package/platforms/Platform.d.ts +6 -10
- package/platforms/Platform.js +14 -39
- package/serialization/EntitySerializer.d.ts +2 -0
- package/serialization/EntitySerializer.js +32 -14
- package/serialization/EntityTransformer.js +22 -12
- package/serialization/SerializationContext.js +16 -13
- package/types/ArrayType.d.ts +1 -1
- package/types/ArrayType.js +2 -3
- package/types/BigIntType.d.ts +8 -6
- package/types/BigIntType.js +1 -1
- package/types/BlobType.d.ts +0 -1
- package/types/BlobType.js +0 -3
- package/types/BooleanType.d.ts +2 -1
- package/types/BooleanType.js +3 -0
- package/types/DecimalType.d.ts +6 -4
- package/types/DecimalType.js +3 -3
- package/types/DoubleType.js +2 -2
- package/types/JsonType.d.ts +1 -1
- package/types/JsonType.js +7 -2
- package/types/TinyIntType.js +1 -1
- package/types/Type.d.ts +2 -1
- package/types/Type.js +1 -1
- package/types/Uint8ArrayType.d.ts +0 -1
- package/types/Uint8ArrayType.js +1 -4
- package/types/index.d.ts +1 -1
- package/typings.d.ts +113 -77
- package/typings.js +41 -35
- package/unit-of-work/ChangeSetComputer.d.ts +1 -3
- package/unit-of-work/ChangeSetComputer.js +11 -9
- package/unit-of-work/ChangeSetPersister.d.ts +5 -4
- package/unit-of-work/ChangeSetPersister.js +58 -20
- package/unit-of-work/UnitOfWork.d.ts +8 -1
- package/unit-of-work/UnitOfWork.js +115 -57
- package/utils/AbstractSchemaGenerator.d.ts +5 -5
- package/utils/AbstractSchemaGenerator.js +11 -9
- package/utils/Configuration.d.ts +757 -206
- package/utils/Configuration.js +139 -187
- package/utils/ConfigurationLoader.d.ts +1 -54
- package/utils/ConfigurationLoader.js +1 -352
- package/utils/Cursor.d.ts +3 -3
- package/utils/Cursor.js +4 -1
- package/utils/DataloaderUtils.d.ts +15 -5
- package/utils/DataloaderUtils.js +54 -8
- package/utils/EntityComparator.d.ts +8 -4
- package/utils/EntityComparator.js +111 -64
- package/utils/QueryHelper.d.ts +9 -1
- package/utils/QueryHelper.js +70 -9
- package/utils/RawQueryFragment.d.ts +36 -4
- package/utils/RawQueryFragment.js +35 -14
- package/utils/TransactionManager.d.ts +65 -0
- package/utils/TransactionManager.js +223 -0
- package/utils/Utils.d.ts +8 -97
- package/utils/Utils.js +88 -303
- package/utils/clone.js +2 -3
- package/utils/env-vars.d.ts +3 -0
- package/utils/env-vars.js +87 -0
- package/utils/fs-utils.d.ts +12 -0
- package/utils/fs-utils.js +96 -0
- package/utils/index.d.ts +2 -1
- package/utils/index.js +2 -1
- package/utils/upsert-utils.d.ts +7 -2
- package/utils/upsert-utils.js +55 -4
- package/decorators/Check.d.ts +0 -3
- package/decorators/Check.js +0 -13
- package/decorators/CreateRequestContext.d.ts +0 -3
- package/decorators/CreateRequestContext.js +0 -32
- package/decorators/Embeddable.d.ts +0 -8
- package/decorators/Embeddable.js +0 -11
- package/decorators/Embedded.d.ts +0 -18
- package/decorators/Embedded.js +0 -18
- package/decorators/Entity.d.ts +0 -18
- package/decorators/Entity.js +0 -12
- package/decorators/Enum.d.ts +0 -9
- package/decorators/Enum.js +0 -16
- package/decorators/Filter.d.ts +0 -2
- package/decorators/Filter.js +0 -8
- package/decorators/Formula.d.ts +0 -4
- package/decorators/Formula.js +0 -15
- package/decorators/Indexed.d.ts +0 -19
- package/decorators/Indexed.js +0 -20
- package/decorators/ManyToMany.d.ts +0 -40
- package/decorators/ManyToMany.js +0 -14
- package/decorators/ManyToOne.d.ts +0 -30
- package/decorators/ManyToOne.js +0 -14
- package/decorators/OneToMany.d.ts +0 -28
- package/decorators/OneToMany.js +0 -17
- package/decorators/OneToOne.d.ts +0 -24
- package/decorators/OneToOne.js +0 -7
- package/decorators/PrimaryKey.d.ts +0 -8
- package/decorators/PrimaryKey.js +0 -20
- package/decorators/Property.d.ts +0 -250
- package/decorators/Property.js +0 -32
- package/decorators/Transactional.d.ts +0 -13
- package/decorators/Transactional.js +0 -28
- package/decorators/hooks.d.ts +0 -16
- package/decorators/hooks.js +0 -47
- package/decorators/index.d.ts +0 -17
- package/decorators/index.js +0 -17
- package/entity/ArrayCollection.d.ts +0 -116
- package/entity/ArrayCollection.js +0 -402
- package/entity/EntityValidator.d.ts +0 -19
- package/entity/EntityValidator.js +0 -150
- package/metadata/ReflectMetadataProvider.d.ts +0 -8
- package/metadata/ReflectMetadataProvider.js +0 -44
- package/utils/resolveContextProvider.d.ts +0 -10
- package/utils/resolveContextProvider.js +0 -28
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import type { EntityManager } from '../EntityManager.js';
|
|
2
|
+
import { type TransactionOptions } from '../enums.js';
|
|
3
|
+
/**
|
|
4
|
+
* Manages transaction lifecycle and propagation for EntityManager.
|
|
5
|
+
*/
|
|
6
|
+
export declare class TransactionManager {
|
|
7
|
+
private readonly em;
|
|
8
|
+
constructor(em: EntityManager);
|
|
9
|
+
/**
|
|
10
|
+
* Main entry point for handling transactional operations with propagation support.
|
|
11
|
+
*/
|
|
12
|
+
handle<T>(cb: (em: EntityManager) => T | Promise<T>, options?: TransactionOptions): Promise<T>;
|
|
13
|
+
/**
|
|
14
|
+
* Executes the callback with the specified propagation type.
|
|
15
|
+
*/
|
|
16
|
+
private executeWithPropagation;
|
|
17
|
+
/**
|
|
18
|
+
* Suspends the current transaction and returns the suspended resources.
|
|
19
|
+
*/
|
|
20
|
+
private suspendTransaction;
|
|
21
|
+
/**
|
|
22
|
+
* Resumes a previously suspended transaction.
|
|
23
|
+
*/
|
|
24
|
+
private resumeTransaction;
|
|
25
|
+
/**
|
|
26
|
+
* Executes operation without transaction context.
|
|
27
|
+
*/
|
|
28
|
+
private executeWithoutTransaction;
|
|
29
|
+
/**
|
|
30
|
+
* Creates new independent transaction, suspending any existing one.
|
|
31
|
+
*/
|
|
32
|
+
private executeWithNewTransaction;
|
|
33
|
+
/**
|
|
34
|
+
* Creates new transaction context.
|
|
35
|
+
*/
|
|
36
|
+
private createNewTransaction;
|
|
37
|
+
/**
|
|
38
|
+
* Executes nested transaction with savepoint.
|
|
39
|
+
*/
|
|
40
|
+
private executeNestedTransaction;
|
|
41
|
+
/**
|
|
42
|
+
* Creates a fork of the EntityManager with the given options.
|
|
43
|
+
*/
|
|
44
|
+
private createFork;
|
|
45
|
+
/**
|
|
46
|
+
* Determines if changes should be propagated to the upper context.
|
|
47
|
+
*/
|
|
48
|
+
private shouldPropagateToUpperContext;
|
|
49
|
+
/**
|
|
50
|
+
* Merges entities from fork to parent EntityManager.
|
|
51
|
+
*/
|
|
52
|
+
private mergeEntitiesToParent;
|
|
53
|
+
/**
|
|
54
|
+
* Registers a deletion handler to unset entity identities after flush.
|
|
55
|
+
*/
|
|
56
|
+
private registerDeletionHandler;
|
|
57
|
+
/**
|
|
58
|
+
* Processes transaction execution.
|
|
59
|
+
*/
|
|
60
|
+
private processTransaction;
|
|
61
|
+
/**
|
|
62
|
+
* Executes transaction workflow with entity synchronization.
|
|
63
|
+
*/
|
|
64
|
+
private executeTransactionFlow;
|
|
65
|
+
}
|
|
@@ -0,0 +1,223 @@
|
|
|
1
|
+
import { ReferenceKind, TransactionPropagation } from '../enums.js';
|
|
2
|
+
import { TransactionEventBroadcaster } from '../events/TransactionEventBroadcaster.js';
|
|
3
|
+
import { TransactionContext } from '../utils/TransactionContext.js';
|
|
4
|
+
import { ChangeSetType } from '../unit-of-work/ChangeSet.js';
|
|
5
|
+
import { TransactionStateError } from '../errors.js';
|
|
6
|
+
import { helper } from '../entity/wrap.js';
|
|
7
|
+
/**
|
|
8
|
+
* Manages transaction lifecycle and propagation for EntityManager.
|
|
9
|
+
*/
|
|
10
|
+
export class TransactionManager {
|
|
11
|
+
em;
|
|
12
|
+
constructor(em) {
|
|
13
|
+
this.em = em;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Main entry point for handling transactional operations with propagation support.
|
|
17
|
+
*/
|
|
18
|
+
async handle(cb, options = {}) {
|
|
19
|
+
const em = this.em.getContext(false);
|
|
20
|
+
options.propagation ??= TransactionPropagation.NESTED;
|
|
21
|
+
options.ctx ??= em.getTransactionContext();
|
|
22
|
+
const hasExistingTransaction = !!em.getTransactionContext();
|
|
23
|
+
return this.executeWithPropagation(options.propagation, em, cb, options, hasExistingTransaction);
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Executes the callback with the specified propagation type.
|
|
27
|
+
*/
|
|
28
|
+
async executeWithPropagation(propagation, em, cb, options, hasExistingTransaction) {
|
|
29
|
+
switch (propagation) {
|
|
30
|
+
case TransactionPropagation.NOT_SUPPORTED:
|
|
31
|
+
return this.executeWithoutTransaction(em, cb, options);
|
|
32
|
+
case TransactionPropagation.REQUIRES_NEW:
|
|
33
|
+
return this.executeWithNewTransaction(em, cb, options, hasExistingTransaction);
|
|
34
|
+
case TransactionPropagation.REQUIRED:
|
|
35
|
+
if (hasExistingTransaction) {
|
|
36
|
+
return cb(em);
|
|
37
|
+
}
|
|
38
|
+
return this.createNewTransaction(em, cb, options);
|
|
39
|
+
case TransactionPropagation.NESTED:
|
|
40
|
+
if (hasExistingTransaction) {
|
|
41
|
+
return this.executeNestedTransaction(em, cb, options);
|
|
42
|
+
}
|
|
43
|
+
return this.createNewTransaction(em, cb, options);
|
|
44
|
+
case TransactionPropagation.SUPPORTS:
|
|
45
|
+
if (hasExistingTransaction) {
|
|
46
|
+
return cb(em);
|
|
47
|
+
}
|
|
48
|
+
return this.executeWithoutTransaction(em, cb, options);
|
|
49
|
+
case TransactionPropagation.MANDATORY:
|
|
50
|
+
if (!hasExistingTransaction) {
|
|
51
|
+
throw TransactionStateError.requiredTransactionNotFound(propagation);
|
|
52
|
+
}
|
|
53
|
+
return cb(em);
|
|
54
|
+
case TransactionPropagation.NEVER:
|
|
55
|
+
if (hasExistingTransaction) {
|
|
56
|
+
throw TransactionStateError.transactionNotAllowed(propagation);
|
|
57
|
+
}
|
|
58
|
+
return this.executeWithoutTransaction(em, cb, options);
|
|
59
|
+
default:
|
|
60
|
+
throw TransactionStateError.invalidPropagation(propagation);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Suspends the current transaction and returns the suspended resources.
|
|
65
|
+
*/
|
|
66
|
+
suspendTransaction(em) {
|
|
67
|
+
const suspended = em.getTransactionContext();
|
|
68
|
+
em.resetTransactionContext();
|
|
69
|
+
return suspended;
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Resumes a previously suspended transaction.
|
|
73
|
+
*/
|
|
74
|
+
resumeTransaction(em, suspended) {
|
|
75
|
+
if (suspended != null) {
|
|
76
|
+
em.setTransactionContext(suspended);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Executes operation without transaction context.
|
|
81
|
+
*/
|
|
82
|
+
async executeWithoutTransaction(em, cb, options) {
|
|
83
|
+
const suspended = this.suspendTransaction(em);
|
|
84
|
+
const fork = this.createFork(em, { ...options, disableTransactions: true });
|
|
85
|
+
const propagateToUpperContext = this.shouldPropagateToUpperContext(em);
|
|
86
|
+
try {
|
|
87
|
+
return await this.executeTransactionFlow(fork, cb, propagateToUpperContext, em);
|
|
88
|
+
}
|
|
89
|
+
finally {
|
|
90
|
+
this.resumeTransaction(em, suspended);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Creates new independent transaction, suspending any existing one.
|
|
95
|
+
*/
|
|
96
|
+
async executeWithNewTransaction(em, cb, options, hasExistingTransaction) {
|
|
97
|
+
const fork = this.createFork(em, options);
|
|
98
|
+
let suspended = null;
|
|
99
|
+
// Suspend existing transaction if present
|
|
100
|
+
if (hasExistingTransaction) {
|
|
101
|
+
suspended = this.suspendTransaction(em);
|
|
102
|
+
}
|
|
103
|
+
const newOptions = { ...options, ctx: undefined };
|
|
104
|
+
try {
|
|
105
|
+
return await this.processTransaction(em, fork, cb, newOptions);
|
|
106
|
+
}
|
|
107
|
+
finally {
|
|
108
|
+
if (suspended != null) {
|
|
109
|
+
this.resumeTransaction(em, suspended);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Creates new transaction context.
|
|
115
|
+
*/
|
|
116
|
+
async createNewTransaction(em, cb, options) {
|
|
117
|
+
const fork = this.createFork(em, options);
|
|
118
|
+
return this.processTransaction(em, fork, cb, options);
|
|
119
|
+
}
|
|
120
|
+
/**
|
|
121
|
+
* Executes nested transaction with savepoint.
|
|
122
|
+
*/
|
|
123
|
+
async executeNestedTransaction(em, cb, options) {
|
|
124
|
+
const fork = this.createFork(em, options);
|
|
125
|
+
// Pass existing context to create savepoint
|
|
126
|
+
const nestedOptions = { ...options, ctx: em.getTransactionContext() };
|
|
127
|
+
return this.processTransaction(em, fork, cb, nestedOptions);
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* Creates a fork of the EntityManager with the given options.
|
|
131
|
+
*/
|
|
132
|
+
createFork(em, options) {
|
|
133
|
+
return em.fork({
|
|
134
|
+
clear: options.clear ?? false,
|
|
135
|
+
flushMode: options.flushMode,
|
|
136
|
+
cloneEventManager: true,
|
|
137
|
+
disableTransactions: options.ignoreNestedTransactions,
|
|
138
|
+
loggerContext: options.loggerContext,
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Determines if changes should be propagated to the upper context.
|
|
143
|
+
*/
|
|
144
|
+
shouldPropagateToUpperContext(em) {
|
|
145
|
+
return !em.global || this.em.config.get('allowGlobalContext');
|
|
146
|
+
}
|
|
147
|
+
/**
|
|
148
|
+
* Merges entities from fork to parent EntityManager.
|
|
149
|
+
*/
|
|
150
|
+
mergeEntitiesToParent(fork, parent) {
|
|
151
|
+
const parentUoW = parent.getUnitOfWork(false);
|
|
152
|
+
// perf: if parent is empty, we can just move all entities from the fork to skip the `em.merge` overhead
|
|
153
|
+
if (parentUoW.getIdentityMap().keys().length === 0) {
|
|
154
|
+
for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
|
|
155
|
+
parentUoW.getIdentityMap().store(entity);
|
|
156
|
+
helper(entity).__em = parent;
|
|
157
|
+
}
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
160
|
+
for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
|
|
161
|
+
const wrapped = helper(entity);
|
|
162
|
+
const meta = wrapped.__meta;
|
|
163
|
+
// eslint-disable-next-line dot-notation
|
|
164
|
+
const parentEntity = parentUoW.getById(meta.className, wrapped.getPrimaryKey(), parent['_schema'], true);
|
|
165
|
+
if (parentEntity && parentEntity !== entity) {
|
|
166
|
+
const parentWrapped = helper(parentEntity);
|
|
167
|
+
parentWrapped.__data = wrapped.__data;
|
|
168
|
+
parentWrapped.__originalEntityData = wrapped.__originalEntityData;
|
|
169
|
+
for (const prop of meta.hydrateProps) {
|
|
170
|
+
if (prop.kind === ReferenceKind.SCALAR) {
|
|
171
|
+
parentEntity[prop.name] = entity[prop.name];
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
parentUoW.merge(entity, new Set([entity]));
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
/**
|
|
181
|
+
* Registers a deletion handler to unset entity identities after flush.
|
|
182
|
+
*/
|
|
183
|
+
registerDeletionHandler(fork, parent) {
|
|
184
|
+
fork.getEventManager().registerSubscriber({
|
|
185
|
+
afterFlush: (args) => {
|
|
186
|
+
const deletionChangeSets = args.uow.getChangeSets()
|
|
187
|
+
.filter(cs => cs.type === ChangeSetType.DELETE || cs.type === ChangeSetType.DELETE_EARLY);
|
|
188
|
+
for (const cs of deletionChangeSets) {
|
|
189
|
+
parent.getUnitOfWork(false).unsetIdentity(cs.entity);
|
|
190
|
+
}
|
|
191
|
+
},
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* Processes transaction execution.
|
|
196
|
+
*/
|
|
197
|
+
async processTransaction(em, fork, cb, options) {
|
|
198
|
+
const propagateToUpperContext = this.shouldPropagateToUpperContext(em);
|
|
199
|
+
const eventBroadcaster = new TransactionEventBroadcaster(fork, undefined);
|
|
200
|
+
return TransactionContext.create(fork, () => fork.getConnection().transactional(async (trx) => {
|
|
201
|
+
fork.setTransactionContext(trx);
|
|
202
|
+
return this.executeTransactionFlow(fork, cb, propagateToUpperContext, em);
|
|
203
|
+
}, { ...options, eventBroadcaster }));
|
|
204
|
+
}
|
|
205
|
+
/**
|
|
206
|
+
* Executes transaction workflow with entity synchronization.
|
|
207
|
+
*/
|
|
208
|
+
async executeTransactionFlow(fork, cb, propagateToUpperContext, parentEm) {
|
|
209
|
+
if (!propagateToUpperContext) {
|
|
210
|
+
const ret = await cb(fork);
|
|
211
|
+
await fork.flush();
|
|
212
|
+
return ret;
|
|
213
|
+
}
|
|
214
|
+
// Setup: Register deletion handler before execution
|
|
215
|
+
this.registerDeletionHandler(fork, parentEm);
|
|
216
|
+
// Execute callback and flush
|
|
217
|
+
const ret = await cb(fork);
|
|
218
|
+
await fork.flush();
|
|
219
|
+
// Synchronization: Merge entities back to the parent
|
|
220
|
+
this.mergeEntitiesToParent(fork, parentEm);
|
|
221
|
+
return ret;
|
|
222
|
+
}
|
|
223
|
+
}
|
package/utils/Utils.d.ts
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import type { Dictionary, EntityData, EntityDictionary, EntityKey, EntityMetadata, EntityName, EntityProperty, IMetadataStorage, Primary } from '../typings.js';
|
|
1
|
+
import type { Dictionary, EntityData, EntityDictionary, EntityKey, EntityMetadata, EntityName, EntityProperty, Primary } from '../typings.js';
|
|
3
2
|
import type { Collection } from '../entity/Collection.js';
|
|
4
3
|
import type { Platform } from '../platforms/Platform.js';
|
|
5
4
|
import type { ScalarReference } from '../entity/Reference.js';
|
|
6
|
-
export declare const ObjectBindingPattern: unique symbol;
|
|
7
5
|
export declare function compareObjects(a: any, b: any): boolean;
|
|
8
6
|
export declare function compareArrays(a: any[] | string, b: any[] | string): boolean;
|
|
9
7
|
export declare function compareBooleans(a: unknown, b: unknown): boolean;
|
|
@@ -16,32 +14,14 @@ export declare function parseJsonSafe<T = unknown>(value: unknown): T;
|
|
|
16
14
|
export declare class Utils {
|
|
17
15
|
static readonly PK_SEPARATOR = "~~~";
|
|
18
16
|
static dynamicImportProvider: (id: string) => Promise<any>;
|
|
19
|
-
/**
|
|
20
|
-
* Checks if the argument is not undefined
|
|
21
|
-
*/
|
|
22
|
-
static isDefined<T = Record<string, unknown>>(data: any): data is T;
|
|
23
17
|
/**
|
|
24
18
|
* Checks if the argument is instance of `Object`. Returns false for arrays.
|
|
25
19
|
*/
|
|
26
20
|
static isObject<T = Dictionary>(o: any): o is T;
|
|
27
|
-
/**
|
|
28
|
-
* Relation decorators allow using two signatures
|
|
29
|
-
* - using first parameter as options object
|
|
30
|
-
* - using all parameters
|
|
31
|
-
*
|
|
32
|
-
* This function validates those two ways are not mixed and returns the final options object.
|
|
33
|
-
* If the second way is used, we always consider the last parameter as options object.
|
|
34
|
-
* @internal
|
|
35
|
-
*/
|
|
36
|
-
static processDecoratorParameters<T>(params: Dictionary): T;
|
|
37
|
-
/**
|
|
38
|
-
* Checks if the argument is instance of `Object`, but not one of the blacklisted types. Returns false for arrays.
|
|
39
|
-
*/
|
|
40
|
-
static isNotObject<T = Dictionary>(o: any, not: any[]): o is T;
|
|
41
21
|
/**
|
|
42
22
|
* Removes `undefined` properties (recursively) so they are not saved as nulls
|
|
43
23
|
*/
|
|
44
|
-
static dropUndefinedProperties
|
|
24
|
+
static dropUndefinedProperties(o: any, value?: undefined | null, visited?: Set<unknown>): void;
|
|
45
25
|
/**
|
|
46
26
|
* Returns the number of properties on `obj`. This is 20x faster than Object.keys(obj).length.
|
|
47
27
|
* @see https://github.com/deepkit/deepkit-framework/blob/master/packages/core/src/core.ts
|
|
@@ -52,14 +32,6 @@ export declare class Utils {
|
|
|
52
32
|
* @see https://github.com/deepkit/deepkit-framework/blob/master/packages/core/src/core.ts
|
|
53
33
|
*/
|
|
54
34
|
static hasObjectKeys(object: Dictionary): boolean;
|
|
55
|
-
/**
|
|
56
|
-
* Checks if the argument is string
|
|
57
|
-
*/
|
|
58
|
-
static isString(s: any): s is string;
|
|
59
|
-
/**
|
|
60
|
-
* Checks if the argument is number
|
|
61
|
-
*/
|
|
62
|
-
static isNumber<T = number>(s: any): s is T;
|
|
63
35
|
/**
|
|
64
36
|
* Checks if arguments are deeply (but not strictly) equal.
|
|
65
37
|
*/
|
|
@@ -80,11 +52,6 @@ export declare class Utils {
|
|
|
80
52
|
* Merges all sources into the target recursively.
|
|
81
53
|
*/
|
|
82
54
|
private static _merge;
|
|
83
|
-
static getRootEntity(metadata: IMetadataStorage, meta: EntityMetadata): EntityMetadata;
|
|
84
|
-
/**
|
|
85
|
-
* Computes difference between two objects, ignoring items missing in `b`.
|
|
86
|
-
*/
|
|
87
|
-
static diff(a: Dictionary, b: Dictionary): Record<keyof (typeof a & typeof b), any>;
|
|
88
55
|
/**
|
|
89
56
|
* Creates deep copy of given object.
|
|
90
57
|
*/
|
|
@@ -102,26 +69,11 @@ export declare class Utils {
|
|
|
102
69
|
*/
|
|
103
70
|
static renameKey<T>(payload: T, from: string | keyof T, to: string): void;
|
|
104
71
|
/**
|
|
105
|
-
* Returns array of functions argument names. Uses
|
|
106
|
-
*/
|
|
107
|
-
static tokenize(func: {
|
|
108
|
-
toString(): string;
|
|
109
|
-
} | string | {
|
|
110
|
-
type: string;
|
|
111
|
-
value: string;
|
|
112
|
-
}[]): {
|
|
113
|
-
type: string;
|
|
114
|
-
value: string;
|
|
115
|
-
}[];
|
|
116
|
-
/**
|
|
117
|
-
* Returns array of functions argument names. Uses `esprima` for source code analysis.
|
|
72
|
+
* Returns array of functions argument names. Uses basic regex for source code analysis, might not work with advanced syntax.
|
|
118
73
|
*/
|
|
119
|
-
static
|
|
74
|
+
static getConstructorParams(func: {
|
|
120
75
|
toString(): string;
|
|
121
|
-
}
|
|
122
|
-
type: string;
|
|
123
|
-
value: string;
|
|
124
|
-
}[], methodName?: string): string[];
|
|
76
|
+
}): string[] | undefined;
|
|
125
77
|
/**
|
|
126
78
|
* Checks whether the argument looks like primary key (string, number or ObjectId).
|
|
127
79
|
*/
|
|
@@ -134,14 +86,14 @@ export declare class Utils {
|
|
|
134
86
|
static getCompositeKeyHash<T>(data: EntityData<T>, meta: EntityMetadata<T>, convertCustomTypes?: boolean, platform?: Platform, flat?: boolean): string;
|
|
135
87
|
static getPrimaryKeyHash(pks: (string | Buffer | Date)[]): string;
|
|
136
88
|
static splitPrimaryKeys<T extends object>(key: string): EntityKey<T>[];
|
|
137
|
-
static getPrimaryKeyValues<T>(entity: T,
|
|
89
|
+
static getPrimaryKeyValues<T>(entity: T, meta: EntityMetadata<T>, allowScalar?: boolean, convertCustomTypes?: boolean): any;
|
|
138
90
|
static getPrimaryKeyCond<T>(entity: T, primaryKeys: EntityKey<T>[]): Record<string, Primary<T>> | null;
|
|
139
91
|
/**
|
|
140
92
|
* Maps nested FKs from `[1, 2, 3]` to `[1, [2, 3]]`.
|
|
141
93
|
*/
|
|
142
94
|
static mapFlatCompositePrimaryKey(fk: Primary<any>[], prop: EntityProperty, fieldNames?: string[], idx?: number): Primary<any> | Primary<any>[];
|
|
143
95
|
static getPrimaryKeyCondFromArray<T extends object>(pks: Primary<T>[], meta: EntityMetadata<T>): Record<string, Primary<T>>;
|
|
144
|
-
static getOrderedPrimaryKeys<T>(id: Primary<T> | Record<string, Primary<T>>, meta: EntityMetadata<T>, platform?: Platform, convertCustomTypes?: boolean): Primary<T>[];
|
|
96
|
+
static getOrderedPrimaryKeys<T>(id: Primary<T> | Record<string, Primary<T>>, meta: EntityMetadata<T>, platform?: Platform, convertCustomTypes?: boolean, allowScalar?: boolean): Primary<T>[];
|
|
145
97
|
/**
|
|
146
98
|
* Checks whether given object is an entity instance.
|
|
147
99
|
*/
|
|
@@ -150,12 +102,6 @@ export declare class Utils {
|
|
|
150
102
|
* Checks whether given object is a scalar reference.
|
|
151
103
|
*/
|
|
152
104
|
static isScalarReference<T = unknown>(data: any, allowReference?: boolean): data is ScalarReference<any> & {};
|
|
153
|
-
/**
|
|
154
|
-
* Checks whether the argument is ObjectId instance
|
|
155
|
-
*/
|
|
156
|
-
static isObjectID(key: any): key is {
|
|
157
|
-
toHexString: () => string;
|
|
158
|
-
};
|
|
159
105
|
/**
|
|
160
106
|
* Checks whether the argument is empty (array without items, object without keys or falsy value).
|
|
161
107
|
*/
|
|
@@ -169,11 +115,6 @@ export declare class Utils {
|
|
|
169
115
|
* Tries to detect TypeScript support.
|
|
170
116
|
*/
|
|
171
117
|
static detectTypeScriptSupport(): boolean;
|
|
172
|
-
/**
|
|
173
|
-
* Uses some dark magic to get source path to caller where decorator is used.
|
|
174
|
-
* Analyses stack trace of error created inside the function call.
|
|
175
|
-
*/
|
|
176
|
-
static lookupPathFromDecorator(name: string, stack?: string[]): string;
|
|
177
118
|
/**
|
|
178
119
|
* Gets the type of the argument.
|
|
179
120
|
*/
|
|
@@ -212,53 +153,23 @@ export declare class Utils {
|
|
|
212
153
|
static findDuplicates<T>(items: T[]): T[];
|
|
213
154
|
static removeDuplicates<T>(items: T[]): T[];
|
|
214
155
|
static randomInt(min: number, max: number): number;
|
|
215
|
-
static pathExists(path: string, options?: GlobbyOptions): Promise<boolean>;
|
|
216
156
|
/**
|
|
217
157
|
* Extracts all possible values of a TS enum. Works with both string and numeric enums.
|
|
218
158
|
*/
|
|
219
159
|
static extractEnumValues(target: Dictionary): (string | number)[];
|
|
220
160
|
static flatten<T>(arrays: T[][]): T[];
|
|
221
161
|
static isOperator(key: PropertyKey, includeGroupOperators?: boolean): boolean;
|
|
222
|
-
static isGroupOperator(key: PropertyKey): boolean;
|
|
223
|
-
static isArrayOperator(key: PropertyKey): boolean;
|
|
224
|
-
static isJsonKeyOperator(key: PropertyKey): boolean;
|
|
225
162
|
static hasNestedKey(object: unknown, key: string): boolean;
|
|
226
|
-
static getGlobalStorage(namespace: string): Dictionary;
|
|
227
|
-
/**
|
|
228
|
-
* Require a module from a specific location
|
|
229
|
-
* @param id The module to require
|
|
230
|
-
* @param [from] Location to start the node resolution
|
|
231
|
-
*/
|
|
232
|
-
static requireFrom<T extends Dictionary>(id: string, from?: string): T;
|
|
233
163
|
static dynamicImport<T = any>(id: string): Promise<T>;
|
|
234
|
-
static setDynamicImportProvider(provider: (id: string) => Promise<unknown>): void;
|
|
235
|
-
static ensureDir(path: string): void;
|
|
236
|
-
static pathExistsSync(path: string): boolean;
|
|
237
|
-
static readJSONSync(path: string): Dictionary;
|
|
238
164
|
static getORMVersion(): string;
|
|
239
165
|
static createFunction(context: Map<string, any>, code: string): any;
|
|
240
166
|
static callCompiledFunction<T extends unknown[], R>(fn: (...args: T) => R, ...args: T): R;
|
|
241
|
-
/**
|
|
242
|
-
* @see https://github.com/mikro-orm/mikro-orm/issues/840
|
|
243
|
-
*/
|
|
244
|
-
static propertyDecoratorReturnValue(): any;
|
|
245
167
|
static unwrapProperty<T>(entity: T, meta: EntityMetadata<T>, prop: EntityProperty<T>, payload?: boolean): [unknown, number[]][];
|
|
246
168
|
static setPayloadProperty<T>(entity: EntityDictionary<T>, meta: EntityMetadata<T>, prop: EntityProperty<T>, value: unknown, idx: number[]): void;
|
|
247
|
-
static tryRequire<T extends Dictionary = any>({ module, from, allowError, warning }: {
|
|
248
|
-
module: string;
|
|
249
|
-
warning: string;
|
|
250
|
-
from?: string;
|
|
251
|
-
allowError?: string;
|
|
252
|
-
}): T | undefined;
|
|
253
169
|
static tryImport<T extends Dictionary = any>({ module, warning }: {
|
|
254
170
|
module: string;
|
|
255
|
-
warning
|
|
171
|
+
warning?: string;
|
|
256
172
|
}): Promise<T | undefined>;
|
|
257
|
-
static stripRelativePath(str: string): string;
|
|
258
|
-
/**
|
|
259
|
-
* simple process.argv parser, supports only properties with long names, prefixed with `--`
|
|
260
|
-
*/
|
|
261
|
-
static parseArgs<T extends Dictionary = Dictionary>(): T;
|
|
262
173
|
static xor(a: boolean, b: boolean): boolean;
|
|
263
174
|
static keys<T extends object>(obj: T): (keyof T)[];
|
|
264
175
|
static values<T extends object>(obj: T): T[keyof T][];
|