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

package/naming-strategy/EntityCaseNamingStrategy.js

@@ -11,7 +11,7 @@ export class EntityCaseNamingStrategy extends AbstractNamingStrategy {
     }
     joinKeyColumnName(entityName, referencedColumnName, composite, tableName) {
         entityName = this.classToTableName(entityName, tableName);
-        const name = entityName.substr(0, 1).toLowerCase() + entityName.substr(1);
+        const name = entityName.substring(0, 1).toLowerCase() + entityName.substring(1);
         if (composite && referencedColumnName) {
             return name + '_' + referencedColumnName;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.0-dev.322",
+  "version": "7.0.0-dev.324",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",

package/serialization/EntitySerializer.js

@@ -36,7 +36,7 @@ export class EntitySerializer {
         const meta = wrapped.__meta;
         let contextCreated = false;
         if (!wrapped.__serializationContext.root) {
-            const root = new SerializationContext(wrapped.__config);
+            const root = new SerializationContext();
             SerializationContext.propagate(root, entity, (meta, prop) => meta.properties[prop]?.kind !== ReferenceKind.SCALAR);
             options.populate = (options.populate ? Utils.asArray(options.populate) : options.populate);
             contextCreated = true;

package/serialization/EntityTransformer.js

@@ -20,7 +20,7 @@ export class EntityTransformer {
             return entity;
         }
         if (!wrapped.__serializationContext.root) {
-            const root = new SerializationContext(wrapped.__config, wrapped.__serializationContext.populate, wrapped.__serializationContext.fields, wrapped.__serializationContext.exclude);
+            const root = new SerializationContext(wrapped.__serializationContext.populate, wrapped.__serializationContext.fields, wrapped.__serializationContext.exclude);
             SerializationContext.propagate(root, entity, isVisible);
             contextCreated = true;
         }
@@ -64,6 +64,9 @@ export class EntityTransformer {
                 if (!partiallyLoaded && !populated && !isPrimary) {
                     continue;
                 }
+                if (root.isExcluded(meta.class, prop) && !populated) {
+                    continue;
+                }
             }
             const cycle = root.visit(meta.class, prop);
             if (cycle && visited) {

package/serialization/SerializationContext.d.ts

@@ -1,5 +1,4 @@
 import type { AnyEntity, EntityMetadata, EntityName, PopulateOptions } from '../typings.js';
-import type { Configuration } from '../utils/Configuration.js';
 /**
  * Helper that allows to keep track of where we are currently at when serializing complex entity graph with cycles.
  * Before we process a property, we call `visit` that checks if it is not a cycle path (but allows to pass cycles that
@@ -9,7 +8,7 @@ export declare class SerializationContext<T extends object> {
     #private;
     readonly path: [EntityName, string][];
     readonly visited: Set<Partial<any>>;
-    constructor(config: Configuration, populate?: PopulateOptions<T>[], fields?: Set<string>, exclude?: string[]);
+    constructor(populate?: PopulateOptions<T>[], fields?: Set<string>, exclude?: readonly string[]);
     /**
      * Returns true when there is a cycle detected.
      */
@@ -21,6 +20,7 @@ export declare class SerializationContext<T extends object> {
      */
     static propagate(root: SerializationContext<any>, entity: AnyEntity, isVisible: (meta: EntityMetadata, prop: string) => boolean): void;
     isMarkedAsPopulated(entityName: EntityName, prop: string): boolean;
+    isExcluded(entityName: EntityName, prop: string): boolean;
     isPartiallyLoaded(entityName: EntityName, prop: string): boolean;
     private register;
 }

package/serialization/SerializationContext.js

@@ -9,12 +9,10 @@ export class SerializationContext {
     path = [];
     visited = new Set();
     #entities = new Set();
-    #config;
     #populate;
     #fields;
     #exclude;
-    constructor(config, populate = [], fields, exclude) {
-        this.#config = config;
+    constructor(populate = [], fields, exclude) {
         this.#populate = populate;
         this.#fields = fields;
         this.#exclude = exclude;
@@ -92,6 +90,13 @@ export class SerializationContext {
         }
         return !!populate?.some(p => p.field === prop);
     }
+    isExcluded(entityName, prop) {
+        if (!this.#exclude || this.#exclude.length === 0) {
+            return false;
+        }
+        const fullPath = this.path.map(segment => segment[1] + '.').join('') + prop;
+        return this.#exclude.includes(fullPath);
+    }
     isPartiallyLoaded(entityName, prop) {
         if (!this.#fields) {
             return true;

package/utils/Utils.js

@@ -123,7 +123,7 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.0-dev.322';
+    static #ORM_VERSION = '7.0.0-dev.324';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */