@mikro-orm/decorators 7.1.13-dev.1 → 7.1.13-dev.12

package/es/Check.js

@@ -1,11 +1,12 @@
+import { ensureOwnMetadataArray } from '../utils.js';
 /** Defines a database check constraint on a property or entity class (TC39 decorator). */
 export function Check(options) {
     return function (value, context) {
         const meta = context.metadata;
-        meta.checks ??= [];
+        const checks = ensureOwnMetadataArray(meta, 'checks');
         if (context.kind === 'field') {
             options.property ??= context.name;
         }
-        meta.checks.push(options);
+        checks.push(options);
     };
 }

package/es/Indexed.js

@@ -1,3 +1,4 @@
+import { ensureOwnMetadataArray } from '../utils.js';
 function createDecorator(options, unique) {
     return function (value, context) {
         const meta = context.metadata;
@@ -5,8 +6,7 @@ function createDecorator(options, unique) {
             options.properties ??= context.name;
         }
         const key = unique ? 'uniques' : 'indexes';
-        meta[key] ??= [];
-        meta[key].push(options);
+        ensureOwnMetadataArray(meta, key).push(options);
     };
 }
 /** Defines a database index on a property or entity class (TC39 decorator). */

package/es/Property.js

@@ -1,5 +1,5 @@
 import { ReferenceKind, Utils } from '@mikro-orm/core';
-import { prepareMetadataContext } from '../utils.js';
+import { ensureOwnMetadataArray, prepareMetadataContext } from '../utils.js';
 /** Defines a scalar property on an entity (TC39 decorator). */
 export function Property(options = {}) {
     return function (value, context) {
@@ -7,7 +7,6 @@ export function Property(options = {}) {
         const { check, ...opts } = options;
         const prop = { kind: ReferenceKind.SCALAR, ...opts };
         const name = options.name ?? context.name;
-        meta.checks ??= [];
         if (context.name !== name) {
             Utils.renameKey(options, 'name', 'fieldName');
         }
@@ -39,7 +38,7 @@ export function Property(options = {}) {
             prop.name = name;
         }
         if (check) {
-            meta.checks.push({ property: prop.name, expression: check });
+            ensureOwnMetadataArray(meta, 'checks').push({ property: prop.name, expression: check });
         }
         meta.properties[prop.name] = prop;
     };

package/es/Trigger.js

@@ -1,8 +1,8 @@
+import { ensureOwnMetadataArray } from '../utils.js';
 /** Defines a database trigger on an entity class (TC39 decorator). */
 export function Trigger(options) {
     return function (value, context) {
         const meta = context.metadata;
-        meta.triggers ??= [];
-        meta.triggers.push(options);
+        ensureOwnMetadataArray(meta, 'triggers').push(options);
     };
 }

package/es/hooks.js

@@ -2,9 +2,9 @@ import { EventType } from '@mikro-orm/core';
 function hook(type) {
     return function (value, context) {
         const meta = context.metadata;
-        meta.hooks ??= {};
-        meta.hooks[type] ??= [];
-        meta.hooks[type].push(value);
+        meta.hooks = Object.hasOwn(meta, 'hooks') ? meta.hooks : { ...meta.hooks };
+        // the array itself may still be inherited from a base class metadata, so never push into it in place
+        meta.hooks[type] = [...(meta.hooks[type] ?? []), value];
     };
 }
 /** Called before a new entity is persisted to the database (TC39 decorator). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/decorators",
-  "version": "7.1.13-dev.1",
+  "version": "7.1.13-dev.12",
   "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",
@@ -52,7 +52,7 @@
     "@mikro-orm/core": "^7.1.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.13-dev.1",
+    "@mikro-orm/core": "7.1.13-dev.12",
     "reflect-metadata": "^0.1.0 || ^0.2.0"
   },
   "peerDependenciesMeta": {

package/utils.d.ts

@@ -34,6 +34,13 @@ export declare function validateSingleDecorator(meta: EntityMetadata, propertyNa
  * exist for some base entity.
  */
 export declare function prepareMetadataContext<T>(context: ClassFieldDecoratorContext<T> | ClassGetterDecoratorContext<T> | ClassSetterDecoratorContext<T> | ClassAccessorDecoratorContext<T> | ClassMethodDecoratorContext<T>, kind?: ReferenceKind): EntityMetadata<T>;
+/**
+ * Ensures the metadata object has its own array under the given key, copying any items inherited from a base class.
+ * The decorator metadata object respects inheritance (a subclass metadata object has the parent metadata object as
+ * its prototype), and the `@Entity()` decorator transfers only own properties of the metadata object, so pushing to
+ * an inherited array would both leak the item to the base class metadata and lose it for the subclass.
+ */
+export declare function ensureOwnMetadataArray<T, K extends 'checks' | 'indexes' | 'uniques' | 'triggers'>(meta: Partial<EntityMetadata<T>>, key: K): NonNullable<Partial<EntityMetadata<T>>[K]>;
 /**
  * Uses some dark magic to get source path to caller where decorator is used.
  * Analyzes stack trace of error created inside the function call.

package/utils.js

@@ -75,6 +75,18 @@ export function prepareMetadataContext(context, kind) {
     }
     return meta;
 }
+/**
+ * Ensures the metadata object has its own array under the given key, copying any items inherited from a base class.
+ * The decorator metadata object respects inheritance (a subclass metadata object has the parent metadata object as
+ * its prototype), and the `@Entity()` decorator transfers only own properties of the metadata object, so pushing to
+ * an inherited array would both leak the item to the base class metadata and lose it for the subclass.
+ */
+export function ensureOwnMetadataArray(meta, key) {
+    if (!Object.hasOwn(meta, key)) {
+        meta[key] = [...(meta[key] ?? [])];
+    }
+    return meta[key];
+}
 /**
  * Uses some dark magic to get source path to caller where decorator is used.
  * Analyzes stack trace of error created inside the function call.