@mikro-orm/decorators 7.0.0-dev.136 → 7.0.0-dev.138

package/es/Embedded.js

@@ -1,10 +1,8 @@
 import { ReferenceKind, Utils, } from '@mikro-orm/core';
-import { validateSingleDecorator } from '../utils.js';
+import { prepareMetadataContext } from '../utils.js';
 export function Embedded(type = {}, options = {}) {
     return function (value, context) {
-        const meta = context.metadata;
-        meta.properties ??= {};
-        validateSingleDecorator(meta, context.name, ReferenceKind.EMBEDDED);
+        const meta = prepareMetadataContext(context, ReferenceKind.EMBEDDED);
         options = type instanceof Function ? { entity: type, ...options } : { ...type, ...options };
         Utils.defaultValue(options, 'prefix', true);
         meta.properties[context.name] = {

package/es/Enum.js

@@ -1,8 +1,8 @@
 import { ReferenceKind, } from '@mikro-orm/core';
+import { prepareMetadataContext } from '../utils.js';
 export function Enum(options = {}) {
     return function (target, context) {
-        const meta = context.metadata;
-        meta.properties ??= {};
+        const meta = prepareMetadataContext(context);
         options = options instanceof Function ? { items: options } : options;
         meta.properties[context.name] = {
             name: context.name,

package/es/Formula.js

@@ -1,8 +1,8 @@
 import { ReferenceKind, } from '@mikro-orm/core';
+import { prepareMetadataContext } from '../utils.js';
 export function Formula(formula, options = {}) {
     return function (value, context) {
-        const meta = context.metadata;
-        meta.properties ??= {};
+        const meta = prepareMetadataContext(context);
         meta.properties[context.name] = {
             name: context.name,
             kind: ReferenceKind.SCALAR,

package/es/ManyToMany.js

@@ -1,10 +1,8 @@
 import { ReferenceKind, Utils, } from '@mikro-orm/core';
-import { processDecoratorParameters, validateSingleDecorator } from '../utils.js';
+import { prepareMetadataContext, processDecoratorParameters } from '../utils.js';
 export function ManyToMany(entity, mappedBy, options = {}) {
     return function (_, context) {
-        const meta = context.metadata;
-        meta.properties ??= {};
-        validateSingleDecorator(meta, context.name, ReferenceKind.MANY_TO_MANY);
+        const meta = prepareMetadataContext(context, ReferenceKind.MANY_TO_MANY);
         options = processDecoratorParameters({ entity, mappedBy, options });
         const property = { name: context.name, kind: ReferenceKind.MANY_TO_MANY };
         meta.properties[context.name] ??= {};

package/es/ManyToOne.js

@@ -1,10 +1,8 @@
 import { ReferenceKind, Utils, } from '@mikro-orm/core';
-import { processDecoratorParameters, validateSingleDecorator } from '../utils.js';
+import { prepareMetadataContext, processDecoratorParameters } from '../utils.js';
 export function ManyToOne(entity = {}, options = {}) {
     return function (_, context) {
-        const meta = context.metadata;
-        meta.properties ??= {};
-        validateSingleDecorator(meta, context.name, ReferenceKind.MANY_TO_ONE);
+        const meta = prepareMetadataContext(context, ReferenceKind.MANY_TO_ONE);
         options = processDecoratorParameters({ entity, options });
         const property = { name: context.name, kind: ReferenceKind.MANY_TO_ONE };
         meta.properties[context.name] = Utils.mergeConfig(meta.properties[context.name] ?? {}, property, options);

package/es/OneToMany.js

@@ -1,10 +1,8 @@
 import { ReferenceKind, Utils, } from '@mikro-orm/core';
-import { processDecoratorParameters, validateSingleDecorator } from '../utils.js';
+import { prepareMetadataContext, processDecoratorParameters } from '../utils.js';
 export function OneToMany(entity, mappedBy, options = {}) {
     return function (value, context) {
-        const meta = context.metadata;
-        meta.properties ??= {};
-        validateSingleDecorator(meta, context.name, ReferenceKind.ONE_TO_MANY);
+        const meta = prepareMetadataContext(context, ReferenceKind.ONE_TO_MANY);
         options = processDecoratorParameters({ entity, mappedBy, options });
         const property = { name: context.name, kind: ReferenceKind.ONE_TO_MANY };
         meta.properties[context.name] ??= {};

package/es/OneToOne.js

@@ -1,12 +1,10 @@
 import { ReferenceKind, } from '@mikro-orm/core';
-import { processDecoratorParameters, validateSingleDecorator } from '../utils.js';
+import { prepareMetadataContext, processDecoratorParameters } from '../utils.js';
 export function OneToOne(entity, mappedByOrOptions, options = {}) {
     const mappedBy = typeof mappedByOrOptions === 'object' ? mappedByOrOptions.mappedBy : mappedByOrOptions;
     options = typeof mappedByOrOptions === 'object' ? { ...mappedByOrOptions, ...options } : options;
     return function (_, context) {
-        const meta = context.metadata;
-        meta.properties ??= {};
-        validateSingleDecorator(meta, context.name, ReferenceKind.ONE_TO_ONE);
+        const meta = prepareMetadataContext(context, ReferenceKind.ONE_TO_ONE);
         options = processDecoratorParameters({ entity, mappedBy, options });
         const property = { name: context.name, kind: ReferenceKind.ONE_TO_ONE };
         meta.properties[context.name] = Object.assign(meta.properties[context.name] ?? {}, property, options);

package/es/PrimaryKey.js

@@ -1,10 +1,8 @@
 import { ReferenceKind, } from '@mikro-orm/core';
-import { validateSingleDecorator } from '../utils.js';
+import { prepareMetadataContext } from '../utils.js';
 function createDecorator(options, serialized) {
     return function (value, context) {
-        const meta = context.metadata;
-        meta.properties ??= {};
-        validateSingleDecorator(meta, context.name, ReferenceKind.SCALAR);
+        const meta = prepareMetadataContext(context, ReferenceKind.SCALAR);
         const key = serialized ? 'serializedPrimaryKey' : 'primary';
         options[key] = true;
         meta.properties[context.name] = { name: context.name, kind: ReferenceKind.SCALAR, ...options };

package/es/Property.js

@@ -1,10 +1,8 @@
 import { ReferenceKind, Utils, } from '@mikro-orm/core';
-import { validateSingleDecorator } from '../utils.js';
+import { prepareMetadataContext } from '../utils.js';
 export function Property(options = {}) {
     return function (value, context) {
-        const meta = context.metadata;
-        meta.properties ??= {};
-        validateSingleDecorator(meta, context.name, ReferenceKind.SCALAR);
+        const meta = prepareMetadataContext(context, ReferenceKind.SCALAR);
         const { check, ...opts } = options;
         const prop = { kind: ReferenceKind.SCALAR, ...opts };
         const name = options.name ?? context.name;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/decorators",
   "type": "module",
-  "version": "7.0.0-dev.136",
+  "version": "7.0.0-dev.138",
   "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.",
   "exports": {
     "./package.json": "./package.json",
@@ -55,7 +55,7 @@
     "@mikro-orm/core": "^6.6.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.136",
+    "@mikro-orm/core": "7.0.0-dev.138",
     "reflect-metadata": "^0.1.0 || ^0.2.0"
   },
   "peerDependenciesMeta": {

package/utils.d.ts

@@ -25,9 +25,15 @@ export declare function processDecoratorParameters<T>(params: Dictionary): T;
 /**
  * Validate there is only one property decorator. This disallows using `@Property()` together with e.g. `@ManyToOne()`
  * on the same property. One should use only `@ManyToOne()` in such case.
- * We allow the existence of the property in metadata if the reference type is the same, this should allow things like HMR to work.
+ * We allow the existence of the property in metadata if the reference kind is the same, this should allow things like HMR to work.
  */
-export declare function validateSingleDecorator(meta: EntityMetadata, propertyName: string, reference: ReferenceKind): void;
+export declare function validateSingleDecorator(meta: EntityMetadata, propertyName: string, kind: ReferenceKind): void;
+/**
+ * Prepares and returns a metadata context for an entity, ensuring default structure and validating proper usage of a single decorator.
+ * We need to use the `Object.hasOwn` here, since the metadata object respects inheritance, and the `properties` object might already
+ * exist for some base entity.
+ */
+export declare function prepareMetadataContext<T>(context: ClassFieldDecoratorContext<T> | ClassGetterDecoratorContext<T> | ClassMethodDecoratorContext<T>, kind?: ReferenceKind): EntityMetadata<T>;
 /**
  * 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

@@ -53,13 +53,28 @@ export function processDecoratorParameters(params) {
 /**
  * Validate there is only one property decorator. This disallows using `@Property()` together with e.g. `@ManyToOne()`
  * on the same property. One should use only `@ManyToOne()` in such case.
- * We allow the existence of the property in metadata if the reference type is the same, this should allow things like HMR to work.
+ * We allow the existence of the property in metadata if the reference kind is the same, this should allow things like HMR to work.
  */
-export function validateSingleDecorator(meta, propertyName, reference) {
-    if (meta.properties[propertyName] && meta.properties[propertyName].kind !== reference) {
+export function validateSingleDecorator(meta, propertyName, kind) {
+    if (meta.properties[propertyName] && meta.properties[propertyName].kind !== kind) {
         throw MetadataError.multipleDecorators(meta.className, propertyName);
     }
 }
+/**
+ * Prepares and returns a metadata context for an entity, ensuring default structure and validating proper usage of a single decorator.
+ * We need to use the `Object.hasOwn` here, since the metadata object respects inheritance, and the `properties` object might already
+ * exist for some base entity.
+ */
+export function prepareMetadataContext(context, kind) {
+    const meta = context.metadata;
+    if (!Object.hasOwn(meta, 'properties')) {
+        meta.properties = {};
+    }
+    if (kind) {
+        validateSingleDecorator(meta, context.name, kind);
+    }
+    return meta;
+}
 /**
  * Uses some dark magic to get source path to caller where decorator is used.
  * Analyzes stack trace of error created inside the function call.