@mikro-orm/core 7.0.0-dev.321 → 7.0.0-dev.322

package/events/EventManager.js

@@ -1,31 +1,31 @@
 import { Utils } from '../utils/Utils.js';
 import { EventType, EventTypeMap } from '../enums.js';
 export class EventManager {
-    listeners = {};
-    entities = new Map();
-    cache = new Map();
-    subscribers = new Set();
+    #listeners = {};
+    #entities = new Map();
+    #cache = new Map();
+    #subscribers = new Set();
     constructor(subscribers) {
         for (const subscriber of subscribers) {
             this.registerSubscriber(subscriber);
         }
     }
     registerSubscriber(subscriber) {
-        if (this.subscribers.has(subscriber)) {
+        if (this.#subscribers.has(subscriber)) {
             return;
         }
-        this.subscribers.add(subscriber);
-        this.entities.set(subscriber, this.getSubscribedEntities(subscriber));
-        this.cache.clear();
+        this.#subscribers.add(subscriber);
+        this.#entities.set(subscriber, this.getSubscribedEntities(subscriber));
+        this.#cache.clear();
         Utils.keys(EventType)
             .filter(event => event in subscriber)
             .forEach(event => {
-            this.listeners[event] ??= new Set();
-            this.listeners[event].add(subscriber);
+            this.#listeners[event] ??= new Set();
+            this.#listeners[event].add(subscriber);
         });
     }
     getSubscribers() {
-        return this.subscribers;
+        return this.#subscribers;
     }
     dispatchEvent(event, args, meta) {
         const listeners = [];
@@ -38,8 +38,8 @@ export class EventManager {
             const handler = typeof hook === 'function' ? hook : (entity[hook] ?? prototypeHook);
             return handler.bind(entity);
         }));
-        for (const listener of this.listeners[event] ?? new Set()) {
-            const entities = this.entities.get(listener);
+        for (const listener of this.#listeners[event] ?? new Set()) {
+            const entities = this.#entities.get(listener);
             if (entities.size === 0 || !entity || entities.has(entity.constructor.name)) {
                 listeners.push(listener[event].bind(listener));
             }
@@ -54,26 +54,26 @@ export class EventManager {
     }
     hasListeners(event, meta) {
         const cacheKey = meta._id + EventTypeMap[event];
-        if (this.cache.has(cacheKey)) {
-            return this.cache.get(cacheKey);
+        if (this.#cache.has(cacheKey)) {
+            return this.#cache.get(cacheKey);
         }
         const hasHooks = meta.hooks[event]?.length;
         if (hasHooks) {
-            this.cache.set(cacheKey, true);
+            this.#cache.set(cacheKey, true);
             return true;
         }
-        for (const listener of this.listeners[event] ?? new Set()) {
-            const entities = this.entities.get(listener);
+        for (const listener of this.#listeners[event] ?? new Set()) {
+            const entities = this.#entities.get(listener);
             if (entities.size === 0 || entities.has(meta.className)) {
-                this.cache.set(cacheKey, true);
+                this.#cache.set(cacheKey, true);
                 return true;
             }
         }
-        this.cache.set(cacheKey, false);
+        this.#cache.set(cacheKey, false);
         return false;
     }
     clone() {
-        return new EventManager(this.subscribers);
+        return new EventManager(this.#subscribers);
     }
     getSubscribedEntities(listener) {
         if (!listener.getSubscribedEntities) {

package/hydration/ObjectHydrator.d.ts

@@ -3,8 +3,7 @@ import { Hydrator } from './Hydrator.js';
 import type { EntityFactory } from '../entity/EntityFactory.js';
 type EntityHydrator<T extends object> = (entity: T, data: EntityData<T>, factory: EntityFactory, newEntity: boolean, convertCustomTypes: boolean, schema?: string, parentSchema?: string, normalizeAccessors?: boolean) => void;
 export declare class ObjectHydrator extends Hydrator {
-    private readonly hydrators;
-    private tmpIndex;
+    #private;
     /**
      * @inheritDoc
      */

package/hydration/ObjectHydrator.js

@@ -7,13 +7,13 @@ import { ReferenceKind } from '../enums.js';
 import { Raw } from '../utils/RawQueryFragment.js';
 import { ValidationError } from '../errors.js';
 export class ObjectHydrator extends Hydrator {
-    hydrators = {
+    #hydrators = {
         'full~true': new Map(),
         'full~false': new Map(),
         'reference~true': new Map(),
         'reference~false': new Map(),
     };
-    tmpIndex = 0;
+    #tmpIndex = 0;
     /**
      * @inheritDoc
      */
@@ -41,7 +41,7 @@ export class ObjectHydrator extends Hydrator {
      */
     getEntityHydrator(meta, type, normalizeAccessors = false) {
         const key = `${type}~${normalizeAccessors}`;
-        const exists = this.hydrators[key].get(meta.class);
+        const exists = this.#hydrators[key].get(meta.class);
         if (exists) {
             return exists;
         }
@@ -71,7 +71,7 @@ export class ObjectHydrator extends Hydrator {
                 .map(k => this.safeKey(k))
                 .join('_');
             const ret = [];
-            const idx = this.tmpIndex++;
+            const idx = this.#tmpIndex++;
             const nullVal = this.config.get('forceUndefined') ? 'undefined' : 'null';
             if (prop.getter && !prop.setter && prop.persist === false) {
                 return [];
@@ -150,7 +150,7 @@ export class ObjectHydrator extends Hydrator {
             const keyOption = prop.targetKey ? `, key: '${prop.targetKey}'` : '';
             if (prop.polymorphic) {
                 // For polymorphic: target class from discriminator map, PK from data.id
-                const discriminatorMapKey = this.safeKey(`discriminatorMap_${prop.name}_${this.tmpIndex++}`);
+                const discriminatorMapKey = this.safeKey(`discriminatorMap_${prop.name}_${this.#tmpIndex++}`);
                 context.set(discriminatorMapKey, prop.discriminatorMap);
                 ret.push(`      const targetClass = ${discriminatorMapKey}[data${dataKey}.discriminator];`);
                 ret.push(`      if (!targetClass) throw new ValidationError(\`Unknown discriminator value '\${data${dataKey}.discriminator}' for polymorphic relation '${prop.name}'. Valid values: \${Object.keys(${discriminatorMapKey}).join(', ')}\`);`);
@@ -163,7 +163,7 @@ export class ObjectHydrator extends Hydrator {
             }
             else {
                 // For regular: fixed target class, PK is the data itself
-                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.tmpIndex++}`);
+                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.#tmpIndex++}`);
                 context.set(targetKey, prop.targetMeta.class);
                 if (prop.ref) {
                     ret.push(`      entity${entityKey} = Reference.create(factory.createReference(${targetKey}, data${dataKey}, { merge: true, convertCustomTypes, normalizeAccessors, schema${keyOption} }));`);
@@ -179,7 +179,7 @@ export class ObjectHydrator extends Hydrator {
                 hydrateTargetExpr = `data${dataKey}.constructor`;
             }
             else {
-                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.tmpIndex++}`);
+                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.#tmpIndex++}`);
                 context.set(targetKey, prop.targetMeta.class);
                 hydrateTargetExpr = targetKey;
             }
@@ -323,7 +323,7 @@ export class ObjectHydrator extends Hydrator {
                 });
             }
             else {
-                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.tmpIndex++}`);
+                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.#tmpIndex++}`);
                 context.set(targetKey, prop.targetMeta.class);
                 ret.push(`    if (entity${entityKey} == null) {`);
                 ret.push(`      entity${entityKey} = factory.createEmbeddable(${targetKey}, embeddedData, { newEntity, convertCustomTypes, normalizeAccessors });`);
@@ -352,7 +352,7 @@ export class ObjectHydrator extends Hydrator {
         const hydrateEmbeddedArray = (prop, path, dataKey) => {
             const entityKey = path.map(k => this.wrap(k)).join('');
             const ret = [];
-            const idx = this.tmpIndex++;
+            const idx = this.#tmpIndex++;
             registerEmbeddedPrototype(prop, path);
             parseObjectEmbeddable(prop, dataKey, ret);
             ret.push(`  if (Array.isArray(data${dataKey})) {`);
@@ -402,7 +402,7 @@ export class ObjectHydrator extends Hydrator {
             `${lines.join('\n')}\n}`;
         const fnKey = `hydrator-${meta.uniqueName}-${type}-${normalizeAccessors}`;
         const hydrator = Utils.createFunction(context, code, this.config.get('compiledFunctions'), fnKey);
-        this.hydrators[key].set(meta.class, hydrator);
+        this.#hydrators[key].set(meta.class, hydrator);
         return hydrator;
     }
     createCollectionItemMapper(prop, context) {
@@ -415,7 +415,7 @@ export class ObjectHydrator extends Hydrator {
             lines.push(`      value = { ...value, ['${prop2.name}']: Reference.wrapReference(entity, { ref: ${prop2.ref} }) };`);
             lines.push(`    }`);
         }
-        const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.tmpIndex++}`);
+        const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.#tmpIndex++}`);
         context.set(targetKey, prop.targetMeta.class);
         lines.push(`    if (isPrimaryKey(value, ${meta.compositePK})) return factory.createReference(${targetKey}, value, { convertCustomTypes, schema, normalizeAccessors, merge: true });`);
         lines.push(`    if (value && value.__entity) return value;`);

package/metadata/MetadataDiscovery.d.ts

@@ -4,15 +4,7 @@ import { MetadataStorage } from './MetadataStorage.js';
 import { EntitySchema } from './EntitySchema.js';
 import type { Platform } from '../platforms/Platform.js';
 export declare class MetadataDiscovery {
-    private readonly metadata;
-    private readonly platform;
-    private readonly config;
-    private readonly namingStrategy;
-    private readonly metadataProvider;
-    private readonly logger;
-    private readonly schemaHelper;
-    private readonly validator;
-    private readonly discovered;
+    #private;
     constructor(metadata: MetadataStorage, platform: Platform, config: Configuration);
     discover(preferTs?: boolean): Promise<MetadataStorage>;
     discoverSync(): MetadataStorage;