@mikro-orm/decorators 7.2.0-dev.8 → 7.2.0

package/README.md

@@ -24,6 +24,7 @@ npm install @mikro-orm/mysql        # MySQL
 npm install @mikro-orm/mariadb      # MariaDB
 npm install @mikro-orm/sqlite       # SQLite
 npm install @mikro-orm/libsql       # libSQL / Turso
+npm install @mikro-orm/sql-js       # sql.js (in-memory SQLite in WASM)
 npm install @mikro-orm/mongodb      # MongoDB
 npm install @mikro-orm/mssql        # MS SQL Server
 npm install @mikro-orm/oracledb     # Oracle

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/ManyToOne.d.ts

@@ -1,3 +1,3 @@
 import { type ManyToOneOptions, type EntityName, type Primary, type Ref } from '@mikro-orm/core';
 /** Defines a many-to-one relationship (TC39 decorator). */
-export declare function ManyToOne<Target extends object, Owner extends object>(entity?: ManyToOneOptions<Owner, Target> | ((e?: Owner) => EntityName<Target> | EntityName[]), options?: Partial<ManyToOneOptions<Owner, Target>>): (_: unknown, context: ClassFieldDecoratorContext<Owner, Target | Primary<Target> | undefined | null | Ref<Target>>) => void;
+export declare function ManyToOne<Target extends object, Owner extends object, Through extends object = Target>(entity?: ManyToOneOptions<Owner, Target, Through> | ((e?: Owner) => EntityName<Target> | EntityName[]), options?: Partial<ManyToOneOptions<Owner, Target, Through>>): (_: unknown, context: ClassFieldDecoratorContext<Owner, Target | Primary<Target> | undefined | null | Ref<Target>>) => void;

package/es/OneToOne.d.ts

@@ -1,3 +1,3 @@
 import { type EntityName, type OneToOneOptions, type Primary, type Ref } from '@mikro-orm/core';
 /** Defines a one-to-one relationship (TC39 decorator). */
-export declare function OneToOne<Target extends object, Owner extends object>(entity?: OneToOneOptions<Owner, Target> | string | ((e: Owner) => EntityName<Target> | EntityName[]), mappedByOrOptions?: (string & keyof Target) | ((e: Target) => any) | Partial<OneToOneOptions<Owner, Target>>, options?: Partial<OneToOneOptions<Owner, Target>>): (_: unknown, context: ClassFieldDecoratorContext<Owner, Target | Primary<Target> | Ref<Target> | null | undefined>) => void;
+export declare function OneToOne<Target extends object, Owner extends object, Through extends object = Target>(entity?: OneToOneOptions<Owner, Target, Through> | string | ((e: Owner) => EntityName<Target> | EntityName[]), mappedByOrOptions?: (string & keyof Target) | ((e: Target) => any) | Partial<OneToOneOptions<Owner, Target, Through>>, options?: Partial<OneToOneOptions<Owner, Target, Through>>): (_: unknown, context: ClassFieldDecoratorContext<Owner, Target | Primary<Target> | Ref<Target> | null | undefined>) => void;

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/legacy/ManyToOne.d.ts

@@ -1,5 +1,5 @@
 import { type ManyToOneOptions, type EntityName } from '@mikro-orm/core';
 /** Defines a many-to-one relationship (legacy TypeScript decorator). */
-export declare function ManyToOne<Target extends object, Owner extends object>(entity: (e?: any) => EntityName<Target> | EntityName[], options?: Partial<ManyToOneOptions<Owner, Target>>): (target: Owner, propertyName: string) => void;
+export declare function ManyToOne<Target extends object, Owner extends object, Through extends object = Target>(entity: (e?: any) => EntityName<Target> | EntityName[], options?: Partial<ManyToOneOptions<Owner, Target, Through>>): (target: Owner, propertyName: string) => void;
 export declare function ManyToOne<Target extends object, Owner extends object>(entity: string, options?: any): never;
-export declare function ManyToOne<Target extends object, Owner extends object>(options?: ManyToOneOptions<Owner, Target>): (target: Owner, propertyName: string) => void;
+export declare function ManyToOne<Target extends object, Owner extends object, Through extends object = Target>(options?: ManyToOneOptions<Owner, Target, Through>): (target: Owner, propertyName: string) => void;

package/legacy/OneToOne.d.ts

@@ -1,4 +1,4 @@
 import { type EntityName, type OneToOneOptions } from '@mikro-orm/core';
 /** Defines a one-to-one relationship (legacy TypeScript decorator). */
-export declare function OneToOne<Target, Owner>(entity: (e: Owner) => EntityName<Target> | EntityName[], mappedByOrOptions?: (string & keyof Target) | ((e: Target) => any) | Partial<OneToOneOptions<Owner, Target>>, options?: Partial<OneToOneOptions<Owner, Target>>): (target: Owner, propertyName: string) => void;
-export declare function OneToOne<Target, Owner>(entity?: OneToOneOptions<Owner, Target>): (target: Owner, propertyName: string) => void;
+export declare function OneToOne<Target, Owner, Through = Target>(entity: (e: Owner) => EntityName<Target> | EntityName[], mappedByOrOptions?: (string & keyof Target) | ((e: Target) => any) | Partial<OneToOneOptions<Owner, Target, Through>>, options?: Partial<OneToOneOptions<Owner, Target, Through>>): (target: Owner, propertyName: string) => void;
+export declare function OneToOne<Target, Owner, Through = Target>(entity?: OneToOneOptions<Owner, Target, Through>): (target: Owner, propertyName: string) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/decorators",
-  "version": "7.2.0-dev.8",
+  "version": "7.2.0",
   "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",
@@ -49,10 +49,10 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.1.11"
+    "@mikro-orm/core": "^7.2.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.0-dev.8",
+    "@mikro-orm/core": "7.2.0",
     "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.
@@ -106,10 +118,11 @@ export function lookupPathFromDecorator(name, stack) {
     if (stack[line].includes('Reflect.decorate')) {
         line++;
     }
-    // Skip decorator runtime helpers (tslib, @oxc-project/runtime, etc.)
+    // Skip decorator runtime helpers (tslib, @oxc-project/runtime, @oxc-node/core, etc.)
     // The @oxc-project/runtime check covers both node_modules installs and Rolldown-bundled
     // virtual modules (e.g. \0@oxc-project+runtime@0.120.0/helpers/decorate.js).
-    while (line < stack.length && /node_modules\/tslib\/|@oxc-project[/+]runtime/.test(stack[line].replace(/\\/g, '/'))) {
+    while (line < stack.length &&
+        /node_modules\/tslib\/|@oxc-project[/+]runtime|@oxc-node\/core\//.test(stack[line].replace(/\\/g, '/'))) {
         line++;
     }
     try {