@mikro-orm/core 6.3.14-dev.70 → 6.3.14-dev.72

package/MikroORM.js

@@ -174,11 +174,11 @@ class MikroORM {
         return this.metadata;
     }
     async discoverEntities() {
-        this.metadata = await this.discovery.discover(this.config.get('tsNode'));
+        this.metadata = await this.discovery.discover(this.config.get('preferTs'));
         this.createEntityManager();
     }
     discoverEntitiesSync() {
-        this.metadata = this.discovery.discoverSync(this.config.get('tsNode'));
+        this.metadata = this.discovery.discoverSync(this.config.get('preferTs'));
         this.createEntityManager();
     }
     createEntityManager() {

package/errors.d.ts

@@ -55,6 +55,7 @@ export declare class MetadataError<T extends AnyEntity = AnyEntity> extends Vali
     static invalidPrimaryKey(meta: EntityMetadata, prop: EntityProperty, requiredName: string): MetadataError<Partial<any>>;
     static invalidManyToManyWithPivotEntity(meta1: EntityMetadata, prop1: EntityProperty, meta2: EntityMetadata, prop2: EntityProperty): MetadataError<Partial<any>>;
     static targetIsAbstract(meta: EntityMetadata, prop: EntityProperty): MetadataError<Partial<any>>;
+    static nonPersistentCompositeProp(meta: EntityMetadata, prop: EntityProperty): MetadataError<Partial<any>>;
     static propertyTargetsEntityType(meta: EntityMetadata, prop: EntityProperty, target: EntityMetadata): MetadataError<Partial<any>>;
     static fromMissingOption(meta: EntityMetadata, prop: EntityProperty, option: string): MetadataError<Partial<any>>;
     private static fromMessage;

package/errors.js

@@ -198,6 +198,9 @@ class MetadataError extends ValidationError {
     static targetIsAbstract(meta, prop) {
         return this.fromMessage(meta, prop, `targets abstract entity ${prop.type}. Maybe you forgot to put @Entity() decorator on the ${prop.type} class?`);
     }
+    static nonPersistentCompositeProp(meta, prop) {
+        return this.fromMessage(meta, prop, `is non-persistent relation which targets composite primary key. This is not supported and will cause issues, 'persist: false' should be added to the properties representing single columns instead.`);
+    }
     static propertyTargetsEntityType(meta, prop, target) {
         /* istanbul ignore next */
         const suggestion = target.embeddable ? 'Embedded' : 'ManyToOne';

package/metadata/MetadataDiscovery.js

@@ -127,10 +127,10 @@ class MetadataDiscovery {
             return meta;
         });
     }
-    findEntities(preferTsNode, sync = false) {
+    findEntities(preferTs, sync = false) {
         this.discovered.length = 0;
         const options = this.config.get('discovery');
-        const key = (preferTsNode && this.config.get('tsNode', Utils_1.Utils.detectTsNode()) && this.config.get('entitiesTs').length > 0) ? 'entitiesTs' : 'entities';
+        const key = (preferTs && this.config.get('preferTs', Utils_1.Utils.detectTsNode()) && this.config.get('entitiesTs').length > 0) ? 'entitiesTs' : 'entities';
         const paths = this.config.get(key).filter(item => Utils_1.Utils.isString(item));
         const refs = this.config.get(key).filter(item => !Utils_1.Utils.isString(item));
         if (paths.length > 0) {

package/metadata/MetadataValidator.js

@@ -41,7 +41,7 @@ class MetadataValidator {
         this.validateIndexes(meta, meta.uniques ?? [], 'unique');
         for (const prop of utils_1.Utils.values(meta.properties)) {
             if (prop.kind !== enums_1.ReferenceKind.SCALAR) {
-                this.validateReference(meta, prop, metadata);
+                this.validateReference(meta, prop, metadata, options);
                 this.validateBidirectional(meta, prop, metadata);
             }
             else if (metadata.has(prop.type)) {
@@ -98,7 +98,7 @@ class MetadataValidator {
             }
         });
     }
-    validateReference(meta, prop, metadata) {
+    validateReference(meta, prop, metadata, options) {
         // references do have types
         if (!prop.type) {
             throw errors_1.MetadataError.fromWrongTypeDefinition(meta, prop);
@@ -110,6 +110,9 @@ class MetadataValidator {
         if (metadata.find(prop.type).abstract && !metadata.find(prop.type).discriminatorColumn) {
             throw errors_1.MetadataError.targetIsAbstract(meta, prop);
         }
+        if (prop.persist === false && metadata.find(prop.type).compositePK && options.checkNonPersistentCompositeProps) {
+            throw errors_1.MetadataError.nonPersistentCompositeProp(meta, prop);
+        }
     }
     validateBidirectional(meta, prop, metadata) {
         if (prop.inversedBy) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.14-dev.70",
+  "version": "6.3.14-dev.72",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.14-dev.70",
+    "mikro-orm": "6.3.14-dev.72",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/Configuration.d.ts

@@ -34,9 +34,10 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
             requireEntitiesArray: false;
             checkDuplicateTableNames: true;
             checkDuplicateFieldNames: true;
+            checkDuplicateEntities: true;
+            checkNonPersistentCompositeProps: true;
             alwaysAnalyseProperties: true;
             disableDynamicFileAccess: false;
-            checkDuplicateEntities: true;
             inferDefaultValues: true;
         };
         strict: false;
@@ -294,11 +295,12 @@ export interface MetadataDiscoveryOptions {
     requireEntitiesArray?: boolean;
     checkDuplicateTableNames?: boolean;
     checkDuplicateFieldNames?: boolean;
+    checkDuplicateEntities?: boolean;
+    checkNonPersistentCompositeProps?: boolean;
     alwaysAnalyseProperties?: boolean;
     disableDynamicFileAccess?: boolean;
     inferDefaultValues?: boolean;
     getMappedType?: (type: string, platform: Platform) => Type<unknown> | undefined;
-    checkDuplicateEntities?: boolean;
     onMetadata?: (meta: EntityMetadata, platform: Platform) => MaybePromise<void>;
     afterDiscovered?: (storage: MetadataStorage, platform: Platform) => MaybePromise<void>;
     tsConfigPath?: string;
@@ -370,6 +372,13 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     debug: boolean | LoggerNamespace[];
     ignoreDeprecations: boolean | string[];
     highlighter: Highlighter;
+    /**
+     * Using this option, you can force the ORM to use the TS options regardless of whether the TypeScript support
+     * is detected or not. This effectively means using `entitiesTs` for discovery and `pathTs` for migrations and
+     * seeders. Should be used only for tests and stay disabled for production builds.
+     */
+    preferTs?: boolean;
+    /** @deprecated use `preferTs` instead */
     tsNode?: boolean;
     baseDir: string;
     migrations: MigrationsOptions;

package/utils/Configuration.js

@@ -27,9 +27,10 @@ class Configuration {
             requireEntitiesArray: false,
             checkDuplicateTableNames: true,
             checkDuplicateFieldNames: true,
+            checkDuplicateEntities: true,
+            checkNonPersistentCompositeProps: true,
             alwaysAnalyseProperties: true,
             disableDynamicFileAccess: false,
-            checkDuplicateEntities: true,
             inferDefaultValues: true,
         },
         strict: false,
@@ -145,6 +146,7 @@ class Configuration {
         }
         this.options = Utils_1.Utils.mergeConfig({}, Configuration.DEFAULTS, options);
         this.options.baseDir = Utils_1.Utils.absolutePath(this.options.baseDir);
+        this.options.preferTs ??= options.tsNode;
         if (validate) {
             this.validateOptions();
         }
@@ -330,6 +332,7 @@ class Configuration {
     }
     sync() {
         process.env.MIKRO_ORM_COLORS = '' + this.options.colors;
+        this.options.tsNode = this.options.preferTs;
         this.logger.setDebugMode(this.options.debug);
     }
     /**