@mikro-orm/sql 7.1.5 → 7.1.6-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.5",
+  "version": "7.1.6-dev.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",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.1.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.5"
+    "@mikro-orm/core": "7.1.6-dev.0"
   },
   "engines": {
     "node": ">= 22.17.0"

package/typings.d.ts

@@ -1,5 +1,5 @@
 import type { Generated, Kysely } from 'kysely';
-import type { CheckCallback, DeferMode, Dictionary, EntityName, EntityProperty, EntitySchemaWithMeta, FilterQuery, GroupOperator, IndexColumnOptions, InferEntityName, Opt, Primary, PrimaryProperty, QueryFlag, QueryOrderMap, RawQueryFragment, RoutineIgnoreField, Scalar, Type } from '@mikro-orm/core';
+import type { CheckCallback, DeferMode, Dictionary, EntityName, EntityProperty, EntitySchemaWithMeta, ExtractDefineEntityProperties, FilterQuery, GroupOperator, IndexColumnOptions, InferEntityName, Opt, Primary, PrimaryProperty, QueryFlag, QueryOrderMap, RawQueryFragment, RoutineIgnoreField, Scalar, Type } from '@mikro-orm/core';
 import type { JoinType, QueryType } from './query/enums.js';
 import type { DatabaseSchema } from './schema/DatabaseSchema.js';
 import type { DatabaseTable } from './schema/DatabaseTable.js';
@@ -307,7 +307,10 @@ export interface ICriteriaNode<T extends object> {
     getPivotPath(path: string): string;
 }
 export type MaybeReturnType<T> = T extends (...args: any[]) => infer R ? R : T;
-export type InferEntityProperties<Schema> = Schema extends EntitySchemaWithMeta<any, any, any, any, infer Properties> ? Properties : never;
+export type InferEntityProperties<Schema> = Schema extends EntitySchemaWithMeta<any, any, any, infer Base, infer Properties> ? MergeInheritedProperties<Base, Properties> : never;
+type MergeInheritedProperties<Base, Properties extends Record<string, any>> = [
+    ExtractDefineEntityProperties<Base>
+] extends [infer BaseProps extends Record<string, any>] ? [BaseProps] extends [never] ? Properties : Omit<BaseProps, keyof Properties> & Properties : Properties;
 export type InferKyselyDB<TEntities extends {
     name: string;
 }, TOptions extends MikroKyselyPluginOptions = {}> = MapValueAsTable<MapTableName<TEntities, TOptions>, TOptions>;