@mikro-orm/knex 6.0.0-dev.29 → 6.0.0-dev.30

package/AbstractSqlConnection.js

@@ -78,7 +78,7 @@ class AbstractSqlConnection extends core_1.Connection {
     }
     async execute(queryOrKnex, params = [], method = 'all', ctx) {
         if (core_1.Utils.isObject(queryOrKnex)) {
-            ctx ?? (ctx = queryOrKnex.client.transacting ? queryOrKnex : null);
+            ctx ??= (queryOrKnex.client.transacting ? queryOrKnex : null);
             const q = queryOrKnex.toSQL();
             queryOrKnex = q.sql;
             params = q.bindings;
@@ -177,5 +177,5 @@ class AbstractSqlConnection extends core_1.Connection {
         };
     }
 }
-AbstractSqlConnection.__patched = false;
 exports.AbstractSqlConnection = AbstractSqlConnection;
+AbstractSqlConnection.__patched = false;

package/AbstractSqlDriver.js

@@ -73,7 +73,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             opts.limit = 1;
         }
         if (opts.limit > 0 && !opts.flags?.includes(core_1.QueryFlag.DISABLE_PAGINATE)) {
-            opts.flags ?? (opts.flags = []);
+            opts.flags ??= [];
             opts.flags.push(core_1.QueryFlag.DISABLE_PAGINATE);
         }
         const res = await this.find(entityName, where, opts);
@@ -150,7 +150,6 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
     mapJoinedProps(result, meta, populate, qb, root, map, parentJoinPath) {
         const joinedProps = this.joinedProps(meta, populate);
         joinedProps.forEach(p => {
-            var _a, _b;
             const relation = meta.properties[p.field];
             /* istanbul ignore next */
             if (!relation) {
@@ -168,7 +167,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             if (!hasPK) {
                 // initialize empty collections
                 if ([core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(relation.kind)) {
-                    result[_a = relation.name] ?? (result[_a] = []);
+                    result[relation.name] ??= [];
                 }
                 return;
             }
@@ -193,7 +192,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 map[key] = result;
             }
             if ([core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(relation.kind)) {
-                result[_b = relation.name] ?? (result[_b] = []);
+                result[relation.name] ??= [];
                 this.appendToCollection(meta2, result[relation.name], relationPojo);
             }
             else {
@@ -228,7 +227,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return this.rethrow(qb.getCount());
     }
     async nativeInsert(entityName, data, options = {}) {
-        options.convertCustomTypes ?? (options.convertCustomTypes = true);
+        options.convertCustomTypes ??= true;
         const meta = this.metadata.find(entityName);
         const collections = this.extractManyToMany(entityName, data);
         const pks = meta?.primaryKeys ?? [this.config.getNamingStrategy().referenceColumnName()];
@@ -248,8 +247,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return res;
     }
     async nativeInsertMany(entityName, data, options = {}) {
-        options.processCollections ?? (options.processCollections = true);
-        options.convertCustomTypes ?? (options.convertCustomTypes = true);
+        options.processCollections ??= true;
+        options.convertCustomTypes ??= true;
         const meta = this.metadata.find(entityName);
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(entityName, d)) : [];
         const pks = this.getPrimaryKeyFields(entityName);
@@ -302,8 +301,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             pk = data.map(d => core_1.Utils.getPrimaryKeyCond(d, pks));
         }
         else {
-            res.row ?? (res.row = {});
-            res.rows ?? (res.rows = []);
+            res.row ??= {};
+            res.rows ??= [];
             pk = data.map((d, i) => d[pks[0]] ?? res.rows[i]?.[pks[0]]).map(d => [d]);
             res.insertId = res.insertId || res.row[pks[0]];
         }
@@ -313,7 +312,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return res;
     }
     async nativeUpdate(entityName, where, data, options = {}) {
-        options.convertCustomTypes ?? (options.convertCustomTypes = true);
+        options.convertCustomTypes ??= true;
         const meta = this.metadata.find(entityName);
         const pks = this.getPrimaryKeyFields(entityName);
         const collections = this.extractManyToMany(entityName, data);
@@ -344,8 +343,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return res;
     }
     async nativeUpdateMany(entityName, where, data, options = {}) {
-        options.processCollections ?? (options.processCollections = true);
-        options.convertCustomTypes ?? (options.convertCustomTypes = true);
+        options.processCollections ??= true;
+        options.convertCustomTypes ??= true;
         const meta = this.metadata.get(entityName);
         if (options.upsert) {
             const uniqueFields = core_1.Utils.isPlainObject(where[0]) ? Object.keys(where[0]) : meta.primaryKeys;
@@ -465,7 +464,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const pivotMeta = this.metadata.find(coll.property.pivotEntity);
         if (pivotMeta.schema === '*') {
             /* istanbul ignore next */
-            options ?? (options = {});
+            options ??= {};
             options.schema = ownerSchema;
         }
         return this.rethrow(this.updateCollectionDiff(meta, coll.property, pks, deleteDiff, insertDiff, options));

package/SqlEntityRepository.d.ts

@@ -5,7 +5,6 @@ import type { SqlEntityManager } from './SqlEntityManager';
 import type { QueryBuilder } from './query';
 export declare class SqlEntityRepository<T extends object> extends EntityRepository<T> {
     protected readonly _em: SqlEntityManager;
-    protected readonly entityName: EntityName<T>;
     constructor(_em: SqlEntityManager, entityName: EntityName<T>);
     /**
      * Creates a QueryBuilder instance

package/SqlEntityRepository.js

@@ -6,7 +6,6 @@ class SqlEntityRepository extends core_1.EntityRepository {
     constructor(_em, entityName) {
         super(_em, entityName);
         this._em = _em;
-        this.entityName = entityName;
     }
     /**
      * Creates a QueryBuilder instance

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.29",
+  "version": "6.0.0-dev.30",
   "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",
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^5.6.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.29"
+    "@mikro-orm/core": "~6.0.0-dev.30"
   }
 }

package/query/QueryBuilder.d.ts

@@ -77,7 +77,7 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
     /**
      * @internal
      */
-    constructor(entityName: EntityName<T> | QueryBuilder<T>, metadata: MetadataStorage, driver: AbstractSqlDriver, context?: Knex.Transaction<any, any[]> | undefined, alias?: string, connectionType?: ConnectionType | undefined, em?: SqlEntityManager<AbstractSqlDriver<import("..").AbstractSqlConnection, import("..").AbstractSqlPlatform>> | undefined);
+    constructor(entityName: EntityName<T> | QueryBuilder<T>, metadata: MetadataStorage, driver: AbstractSqlDriver, context?: Knex.Transaction<any, any[]> | undefined, alias?: string, connectionType?: ConnectionType | undefined, em?: SqlEntityManager<AbstractSqlDriver<import("../AbstractSqlConnection").AbstractSqlConnection, import("../AbstractSqlPlatform").AbstractSqlPlatform>> | undefined);
     select(fields: Field<T> | Field<T>[], distinct?: boolean): SelectQueryBuilder<T>;
     addSelect(fields: Field<T> | Field<T>[]): SelectQueryBuilder<T>;
     distinct(): SelectQueryBuilder<T>;

package/query/QueryBuilder.js

@@ -580,7 +580,7 @@ class QueryBuilder {
             aliased: !this.type || [enums_1.QueryType.SELECT, enums_1.QueryType.COUNT].includes(this.type),
         });
         let aliasedName = `${fromAlias}.${prop.name}#${alias}`;
-        path ?? (path = `${(Object.values(this._joins).find(j => j.alias === fromAlias)?.path ?? entityName)}.${prop.name}`);
+        path ??= `${(Object.values(this._joins).find(j => j.alias === fromAlias)?.path ?? entityName)}.${prop.name}`;
         if (prop.kind === core_1.ReferenceKind.ONE_TO_MANY) {
             this._joins[aliasedName] = this.helper.joinOneToReference(prop, fromAlias, alias, type, cond);
         }
@@ -875,11 +875,11 @@ class QueryBuilder {
     fromSubQuery(target, aliasName) {
         const subQuery = target.getKnexQuery();
         const { entityName } = target.mainAlias;
-        aliasName ?? (aliasName = this.getNextAlias(entityName));
+        aliasName ??= this.getNextAlias(entityName);
         this.createMainAlias(entityName, aliasName, subQuery);
     }
     fromEntityName(entityName, aliasName) {
-        aliasName ?? (aliasName = this._mainAlias?.aliasName ?? this.getNextAlias(entityName));
+        aliasName ??= this._mainAlias?.aliasName ?? this.getNextAlias(entityName);
         this.createMainAlias(entityName, aliasName);
     }
     createQueryBuilderHelper() {

package/schema/DatabaseTable.js

@@ -51,7 +51,6 @@ class DatabaseTable {
     }
     addColumnFromProperty(prop, meta) {
         prop.fieldNames.forEach((field, idx) => {
-            var _a;
             const type = prop.enum ? 'enum' : prop.columnTypes[idx];
             const mappedType = this.platform.getMappedType(type);
             if (mappedType instanceof core_1.DecimalType) {
@@ -64,7 +63,7 @@ class DatabaseTable {
                 }
             }
             if (mappedType instanceof core_1.DateTimeType) {
-                prop.length ?? (prop.length = this.platform.getDefaultDateTimeLength());
+                prop.length ??= this.platform.getDefaultDateTimeLength();
             }
             const primary = !meta.compositePK && !!prop.primary && prop.kind === core_1.ReferenceKind.SCALAR && this.platform.isNumericColumn(mappedType);
             this.columns[field] = {
@@ -84,7 +83,7 @@ class DatabaseTable {
                 extra: prop.extra,
                 ignoreSchemaChanges: prop.ignoreSchemaChanges,
             };
-            (_a = this.columns[field]).unsigned || (_a.unsigned = this.columns[field].autoincrement);
+            this.columns[field].unsigned ||= this.columns[field].autoincrement;
             const defaultValue = this.platform.getSchemaHelper().normalizeDefaultValue(prop.defaultRaw, prop.length);
             this.columns[field].default = defaultValue;
         });

package/schema/SqlSchemaGenerator.js

@@ -143,9 +143,9 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         };
     }
     async prepareSchemaForComparison(options) {
-        options.wrap ?? (options.wrap = this.options.disableForeignKeys);
-        options.safe ?? (options.safe = false);
-        options.dropTables ?? (options.dropTables = true);
+        options.wrap ??= this.options.disableForeignKeys;
+        options.safe ??= false;
+        options.dropTables ??= true;
         const toSchema = this.getTargetSchema(options.schema);
         const fromSchema = options.fromSchema ?? await DatabaseSchema_1.DatabaseSchema.create(this.connection, this.platform, this.config, options.schema);
         const wildcardSchemaTables = Object.values(this.metadata.getAll()).filter(meta => meta.schema === '*').map(meta => meta.tableName);
@@ -353,7 +353,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         await this.driver.execute(this.helper.getDropDatabaseSQL('' + this.knex.ref(name)));
     }
     async execute(sql, options = {}) {
-        options.wrap ?? (options.wrap = false);
+        options.wrap ??= false;
         const lines = this.wrapSchema(sql, options).split('\n').filter(i => i.trim());
         if (lines.length === 0) {
             return;
@@ -365,7 +365,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         await core_1.Utils.runSerial(lines, line => this.driver.execute(line));
     }
     wrapSchema(sql, options = {}) {
-        options.wrap ?? (options.wrap = this.options.disableForeignKeys);
+        options.wrap ??= this.options.disableForeignKeys;
         if (!options.wrap || sql.trim() === '') {
             return sql;
         }