@mikro-orm/core 7.0.0-dev.218 → 7.0.0-dev.219

package/MikroORM.js

@@ -104,7 +104,9 @@ export class MikroORM {
      */
     constructor(options) {
         const env = loadEnvironmentVars();
-        options = Utils.merge(options, env);
+        options = options.preferEnvVars
+            ? Utils.merge(options, env)
+            : Utils.merge(env, options);
         this.config = new Configuration(options);
         const discovery = this.config.get('discovery');
         this.driver = this.config.getDriver();

package/errors.d.ts

@@ -67,7 +67,6 @@ export declare class MetadataError<T extends AnyEntity = AnyEntity> extends Vali
     static targetKeyNotFound(meta: EntityMetadata, prop: EntityProperty): MetadataError<Partial<any>>;
     static dangerousPropertyName(meta: EntityMetadata, prop: EntityProperty): MetadataError<Partial<any>>;
     static viewEntityWithoutExpression(meta: EntityMetadata): MetadataError;
-    static materializedWithoutView(meta: EntityMetadata): MetadataError;
     private static fromMessage;
 }
 export declare class NotFoundError<T extends AnyEntity = AnyEntity> extends ValidationError<T> {

package/errors.js

@@ -228,9 +228,6 @@ export class MetadataError extends ValidationError {
     static viewEntityWithoutExpression(meta) {
         return new MetadataError(`View entity ${meta.className} is missing 'expression'. View entities must have an expression defining the SQL query.`);
     }
-    static materializedWithoutView(meta) {
-        return new MetadataError(`Entity ${meta.className} has 'materialized: true' but is missing 'view: true'. Materialized views must also be marked as views.`);
-    }
     static fromMessage(meta, prop, message) {
         return new MetadataError(`${meta.className}.${prop.name} ${message}`);
     }

package/metadata/MetadataValidator.js

@@ -19,9 +19,6 @@ const DANGEROUS_PROPERTY_NAMES = ['__proto__', 'constructor', 'prototype'];
 export class MetadataValidator {
     validateEntityDefinition(metadata, name, options) {
         const meta = metadata.get(name);
-        if (meta.materialized && !meta.view) {
-            throw MetadataError.materializedWithoutView(meta);
-        }
         // View entities (expression with view flag) behave like regular tables but are read-only
         // They can have primary keys and are created as actual database views
         if (meta.view) {

package/metadata/types.d.ts

@@ -34,20 +34,15 @@ export type EntityOptions<T, E = T extends EntityClass<infer P> ? P : T> = {
      * Marks entity as a database view. Unlike virtual entities which evaluate expressions at query time,
      * view entities create actual database views. The `expression` option must be provided when `view` is true.
      * View entities are read-only by default.
-     */
-    view?: boolean;
-    /**
-     * Marks the view entity as a materialized view. Requires `view: true`.
+     *
+     * Use `view: true` for regular views, or `view: { materialized: true }` for materialized views (PostgreSQL only).
      * Materialized views store the query results and must be refreshed to update data.
-     * Only supported on PostgreSQL.
-     */
-    materialized?: boolean;
-    /**
-     * For materialized views, whether to populate data immediately on creation.
-     * Defaults to `true`. Set to `false` to create an unpopulated materialized view.
-     * Only applicable when `materialized: true`.
+     * Use `view: { materialized: true, withData: false }` to create an unpopulated materialized view.
      */
-    withData?: boolean;
+    view?: boolean | {
+        materialized?: boolean;
+        withData?: boolean;
+    };
     /** Used to make ORM aware of externally defined triggers. This is needed for MS SQL Server multi inserts, ignored in other dialects. */
     hasTriggers?: boolean;
     /** SQL query that maps to a {@doclink virtual-entities | virtual entity}, or for view entities, the view definition. */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.218",
+  "version": "7.0.0-dev.219",
   "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",

package/typings.d.ts

@@ -540,8 +540,11 @@ export interface EntityMetadata<Entity = any, Class extends EntityCtor<Entity> =
     schema?: string;
     pivotTable?: boolean;
     virtual?: boolean;
-    /** True if this entity represents a database view (not a virtual entity). */
-    view?: boolean;
+    /** True if this entity represents a database view (not a virtual entity). Accepts `{ materialized: true }` as input, normalized to `true` during sync. */
+    view?: boolean | {
+        materialized?: boolean;
+        withData?: boolean;
+    };
     /** True if this is a materialized view (PostgreSQL only). Requires `view: true`. */
     materialized?: boolean;
     /** For materialized views, whether data is populated on creation. Defaults to true. */

package/typings.js

@@ -109,6 +109,13 @@ export class EntityMetadata {
             return this.root.uniqueName === prop.targetMeta?.root.uniqueName;
         });
         this.hasUniqueProps = this.uniques.length + this.uniqueProps.length > 0;
+        // Normalize object-form `view` option: `view: { materialized: true, withData: false }`
+        // into flat metadata fields (`view: true`, `materialized: true`, `withData: false`).
+        if (typeof this.view === 'object') {
+            this.materialized = this.view.materialized;
+            this.withData = this.view.withData;
+            this.view = true;
+        }
         // If `view` is set, this is a database view entity (not a virtual entity).
         // Virtual entities evaluate expressions at query time, view entities create actual database views.
         this.virtual = !!this.expression && !this.view;

package/utils/Configuration.d.ts

@@ -753,6 +753,12 @@ export interface Options<Driver extends IDatabaseDriver = IDatabaseDriver, EM ex
      * @default false
      */
     allowGlobalContext?: boolean;
+    /**
+     * When enabled, environment variables take precedence over explicitly provided config options.
+     * By default, explicit options win over env vars.
+     * @default false
+     */
+    preferEnvVars?: boolean;
     /**
      * Disable the identity map.
      * When disabled, each query returns new entity instances.

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.218';
+    static #ORM_VERSION = '7.0.0-dev.219';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */