@mikro-orm/core 6.2.10-dev.73 → 6.2.10-dev.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.2.10-dev.73",
+  "version": "6.2.10-dev.75",
   "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.2.10-dev.73",
+    "mikro-orm": "6.2.10-dev.75",
     "reflect-metadata": "0.2.2"
   }
 }

package/platforms/Platform.d.ts

@@ -58,6 +58,7 @@ export declare abstract class Platform {
         length?: number;
     }): string;
     getDefaultDateTimeLength(): number;
+    getDefaultVarcharLength(): number;
     getDateTypeDeclarationSQL(length?: number): string;
     getTimeTypeDeclarationSQL(length?: number): string;
     getRegExpOperator(val?: unknown, flags?: string): string;

package/platforms/Platform.js

@@ -96,6 +96,9 @@ class Platform {
     getDefaultDateTimeLength() {
         return 0;
     }
+    getDefaultVarcharLength() {
+        return 255;
+    }
     getDateTypeDeclarationSQL(length) {
         return 'date' + (length ? `(${length})` : '');
     }
@@ -151,7 +154,7 @@ class Platform {
         return 'bigint';
     }
     getVarcharTypeDeclarationSQL(column) {
-        return `varchar(${column.length ?? 255})`;
+        return `varchar(${column.length ?? this.getDefaultVarcharLength()})`;
     }
     getIntervalTypeDeclarationSQL(column) {
         return 'interval' + (column.length ? `(${column.length})` : '');

package/serialization/SerializationContext.d.ts

@@ -5,7 +5,7 @@ import type { Configuration } from '../utils/Configuration';
  * Before we process a property, we call `visit` that checks if it is not a cycle path (but allows to pass cycles that
  * are defined in populate hint). If not, we proceed and call `leave` afterwards.
  */
-export declare class SerializationContext<T> {
+export declare class SerializationContext<T extends object> {
     private readonly config;
     private readonly populate;
     private readonly fields?;
@@ -23,7 +23,7 @@ export declare class SerializationContext<T> {
     /**
      * When initializing new context, we need to propagate it to the whole entity graph recursively.
      */
-    static propagate(root: SerializationContext<AnyEntity>, entity: AnyEntity, isVisible: (meta: EntityMetadata, prop: string) => boolean): void;
+    static propagate(root: SerializationContext<any>, entity: AnyEntity, isVisible: (meta: EntityMetadata, prop: string) => boolean): void;
     isMarkedAsPopulated(entityName: string, prop: string): boolean;
     isPartiallyLoaded(entityName: string, prop: string): boolean;
     private register;

package/types/DateTimeType.d.ts

@@ -6,4 +6,5 @@ export declare class DateTimeType extends Type<Date, string> {
     compareAsType(): string;
     get runtimeType(): string;
     ensureComparable(): boolean;
+    getDefaultLength(platform: Platform): number;
 }

package/types/DateTimeType.js

@@ -15,5 +15,8 @@ class DateTimeType extends Type_1.Type {
     ensureComparable() {
         return false;
     }
+    getDefaultLength(platform) {
+        return platform.getDefaultDateTimeLength();
+    }
 }
 exports.DateTimeType = DateTimeType;

package/types/DateType.d.ts

@@ -6,4 +6,5 @@ export declare class DateType extends Type<string | null | undefined, string | n
     ensureComparable(): boolean;
     convertToJSValue(value: any, platform: Platform): string | null | undefined;
     getColumnType(prop: EntityProperty, platform: Platform): string;
+    getDefaultLength(platform: Platform): number;
 }

package/types/DateType.js

@@ -15,5 +15,8 @@ class DateType extends Type_1.Type {
     getColumnType(prop, platform) {
         return platform.getDateTypeDeclarationSQL(prop.length);
     }
+    getDefaultLength(platform) {
+        return 0;
+    }
 }
 exports.DateType = DateType;

package/types/IntervalType.d.ts

@@ -5,4 +5,5 @@ export declare class IntervalType extends Type<string | null | undefined, string
     getColumnType(prop: EntityProperty, platform: Platform): string;
     convertToJSValue(value: string | null | undefined, platform: Platform): string | null | undefined;
     convertToDatabaseValue(value: string | null | undefined, platform: Platform): string | null | undefined;
+    getDefaultLength(platform: Platform): number;
 }

package/types/IntervalType.js

@@ -12,5 +12,8 @@ class IntervalType extends Type_1.Type {
     convertToDatabaseValue(value, platform) {
         return platform.convertIntervalToDatabaseValue(value);
     }
+    getDefaultLength(platform) {
+        return platform.getDefaultDateTimeLength();
+    }
 }
 exports.IntervalType = IntervalType;

package/types/StringType.d.ts

@@ -5,4 +5,5 @@ export declare class StringType extends Type<string | null | undefined, string |
     getColumnType(prop: EntityProperty, platform: Platform): string;
     compareAsType(): string;
     ensureComparable(): boolean;
+    getDefaultLength(platform: Platform): number;
 }

package/types/StringType.js

@@ -12,5 +12,8 @@ class StringType extends Type_1.Type {
     ensureComparable() {
         return false;
     }
+    getDefaultLength(platform) {
+        return platform.getDefaultVarcharLength();
+    }
 }
 exports.StringType = StringType;

package/types/TimeType.d.ts

@@ -6,4 +6,5 @@ export declare class TimeType extends Type {
     compareAsType(): string;
     ensureComparable(): boolean;
     getColumnType(prop: EntityProperty, platform: Platform): string;
+    getDefaultLength(platform: Platform): number;
 }

package/types/TimeType.js

@@ -19,5 +19,8 @@ class TimeType extends Type_1.Type {
     getColumnType(prop, platform) {
         return platform.getTimeTypeDeclarationSQL(prop.length);
     }
+    getDefaultLength(platform) {
+        return platform.getDefaultDateTimeLength();
+    }
 }
 exports.TimeType = TimeType;

package/types/Type.d.ts

@@ -58,6 +58,21 @@ export declare abstract class Type<JSType = string, DBType = JSType> {
      * Gets the SQL declaration snippet for a field of this type.
      */
     getColumnType(prop: EntityProperty, platform: Platform): string;
+    /**
+     * Get the default length for values of this type
+     *
+     * When doing schema generation, if neither "length" nor "columnType" option is provided,
+     * the length will be defaulted to this value.
+     *
+     * When doing entity generation, if the type is recognized to this type, and the inferred length is this value,
+     * the length option will be omitted in the output. If this method is not defined, length is always outputted
+     * based on what is in the database metadata.
+     *
+     * @param platform The platform the default will be used for.
+     *
+     * @return The default value for the given platform.
+     */
+    getDefaultLength?(platform: Platform): number;
     static getType<JSType, DBType = JSType, TypeClass extends Constructor<Type<JSType, DBType>> = Constructor<Type<JSType, DBType>>>(cls: TypeClass): InstanceType<TypeClass>;
     /**
      * Checks whether the argument is instance of `Type`.

package/typings.d.ts

@@ -13,9 +13,9 @@ export type Constructor<T = unknown> = new (...args: any[]) => T;
 export type Dictionary<T = any> = {
     [k: string]: T;
 };
-export type EntityKey<T = unknown, B extends boolean = false> = string & keyof {
-    [K in keyof T as CleanKeys<T, K, B>]?: unknown;
-};
+export type EntityKey<T = unknown, B extends boolean = false> = string & {
+    [K in keyof T]-?: CleanKeys<T, K, B> extends never ? never : K;
+}[keyof T];
 export type EntityValue<T> = T[EntityKey<T>];
 export type FilterKey<T> = keyof FilterQuery<T>;
 export type AsyncFunction<R = any, T = Dictionary> = (args: T) => Promise<T>;
@@ -126,7 +126,7 @@ export type ExpandQuery<T> = T extends object ? T extends Scalar ? never : Filte
 export type EntityProps<T> = {
     -readonly [K in EntityKey<T>]?: T[K];
 };
-export type ObjectQuery<T> = OperatorMap<T> & ExpandObject<T>;
+export type ObjectQuery<T> = OperatorMap<T> & FilterObject<T>;
 export type FilterQuery<T> = ObjectQuery<T> | NonNullable<ExpandScalar<Primary<T>>> | NonNullable<EntityProps<T> & OperatorMap<T>> | FilterQuery<T>[];
 export type QBFilterQuery<T = any> = ObjectQuery<T> | Dictionary;
 export interface IWrappedEntity<Entity extends object> {