@mikro-orm/knex 6.0.0-dev.98 → 6.0.0-dev.99

package/AbstractSqlConnection.js

@@ -10,7 +10,8 @@ function isRootTransaction(trx) {
     return !Object.getOwnPropertySymbols(trx).includes(parentTransactionSymbol);
 }
 class AbstractSqlConnection extends core_1.Connection {
-    static { this.__patched = false; }
+    static __patched = false;
+    client;
     constructor(config, options, type) {
         super(config, options, type);
         this.patchKnexClient();

package/AbstractSqlDriver.js

@@ -5,9 +5,12 @@ const core_1 = require("@mikro-orm/core");
 const query_1 = require("./query");
 const SqlEntityManager_1 = require("./SqlEntityManager");
 class AbstractSqlDriver extends core_1.DatabaseDriver {
+    [core_1.EntityManagerType];
+    connection;
+    replicas = [];
+    platform;
     constructor(config, platform, connection, connector) {
         super(config, connector);
-        this.replicas = [];
         this.connection = new connection(this.config);
         this.replicas = this.createReplicas(conf => new connection(this.config, conf, 'read'));
         this.platform = platform;

package/AbstractSqlPlatform.js

@@ -6,6 +6,7 @@ const core_1 = require("@mikro-orm/core");
 const SqlEntityRepository_1 = require("./SqlEntityRepository");
 const schema_1 = require("./schema");
 class AbstractSqlPlatform extends core_1.Platform {
+    schemaHelper;
     usesPivotTable() {
         return true;
     }

package/SqlEntityRepository.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlEntityRepository = void 0;
 const core_1 = require("@mikro-orm/core");
 class SqlEntityRepository extends core_1.EntityRepository {
+    em;
     constructor(em, entityName) {
         super(em, entityName);
         this.em = em;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.98",
+  "version": "6.0.0-dev.99",
   "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.8.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.98"
+    "@mikro-orm/core": "~6.0.0-dev.99"
   }
 }

package/query/CriteriaNode.js

@@ -9,6 +9,13 @@ const core_1 = require("@mikro-orm/core");
  * @internal
  */
 class CriteriaNode {
+    metadata;
+    entityName;
+    parent;
+    key;
+    payload;
+    prop;
+    index;
     constructor(metadata, entityName, parent, key, validate = true) {
         this.metadata = metadata;
         this.entityName = entityName;

package/query/QueryBuilder.d.ts

@@ -7,6 +7,7 @@ import type { AbstractSqlDriver } from '../AbstractSqlDriver';
 import { QueryBuilderHelper, type Alias } from './QueryBuilderHelper';
 import type { SqlEntityManager } from '../SqlEntityManager';
 import type { Field } from '../typings';
+import type { AbstractSqlPlatform } from '../AbstractSqlPlatform';
 /**
  * SQL query builder with fluent interface.
  *
@@ -80,7 +81,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, logging?: LoggingOptions | 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, AbstractSqlPlatform>> | undefined, logging?: LoggingOptions | 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

@@ -26,6 +26,12 @@ const CriteriaNodeFactory_1 = require("./CriteriaNodeFactory");
  * ```
  */
 class QueryBuilder {
+    metadata;
+    driver;
+    context;
+    connectionType;
+    em;
+    logging;
     get mainAlias() {
         this.ensureFromClause();
         return this._mainAlias;
@@ -37,6 +43,46 @@ class QueryBuilder {
         this.ensureFromClause();
         return this._helper;
     }
+    /** @internal */
+    type;
+    /** @internal */
+    _fields;
+    /** @internal */
+    _populate = [];
+    /** @internal */
+    _populateWhere;
+    /** @internal */
+    _populateMap = {};
+    aliasCounter = 0;
+    flags = new Set([core_1.QueryFlag.CONVERT_CUSTOM_TYPES]);
+    finalized = false;
+    _joins = {};
+    _explicitAlias = false;
+    _schema;
+    _cond = {};
+    _data;
+    _orderBy = [];
+    _groupBy = [];
+    _having = {};
+    _returning;
+    _onConflict;
+    _limit;
+    _offset;
+    _distinctOn;
+    _joinedProps = new Map();
+    _cache;
+    _indexHint;
+    _comments = [];
+    _hintComments = [];
+    flushMode;
+    lockMode;
+    lockTables;
+    subQueries = {};
+    _mainAlias;
+    _aliases = {};
+    _helper;
+    platform;
+    knex;
     /**
      * @internal
      */
@@ -47,24 +93,6 @@ class QueryBuilder {
         this.connectionType = connectionType;
         this.em = em;
         this.logging = logging;
-        /** @internal */
-        this._populate = [];
-        /** @internal */
-        this._populateMap = {};
-        this.aliasCounter = 0;
-        this.flags = new Set([core_1.QueryFlag.CONVERT_CUSTOM_TYPES]);
-        this.finalized = false;
-        this._joins = {};
-        this._explicitAlias = false;
-        this._cond = {};
-        this._orderBy = [];
-        this._groupBy = [];
-        this._having = {};
-        this._joinedProps = new Map();
-        this._comments = [];
-        this._hintComments = [];
-        this.subQueries = {};
-        this._aliases = {};
         this.platform = this.driver.getPlatform();
         this.knex = this.driver.getConnection(this.connectionType).getKnex();
         if (alias) {

package/query/QueryBuilderHelper.js

@@ -8,6 +8,14 @@ const enums_1 = require("./enums");
  * @internal
  */
 class QueryBuilderHelper {
+    entityName;
+    alias;
+    aliasMap;
+    subQueries;
+    knex;
+    driver;
+    platform;
+    metadata;
     constructor(entityName, alias, aliasMap, subQueries, knex, driver) {
         this.entityName = entityName;
         this.alias = alias;
@@ -374,7 +382,8 @@ class QueryBuilderHelper {
         const replacement = this.getOperatorReplacement(op, value);
         const fields = core_1.Utils.splitPrimaryKeys(key);
         if (fields.length > 1 && Array.isArray(value[op]) && !value[op].every((v) => Array.isArray(v))) {
-            value[op] = this.knex.raw(`(${fields.map(() => '?').join(', ')})`, value[op]);
+            const tmp = value[op].length === 1 && core_1.Utils.isPlainObject(value[op][0]) ? fields.map(f => value[op][0][f]) : value[op];
+            value[op] = this.knex.raw(`(${fields.map(() => '?').join(', ')})`, tmp);
         }
         if (this.subQueries[key]) {
             return void qb[m](this.knex.raw(`(${this.subQueries[key]})`), replacement, value[op]);

package/schema/DatabaseSchema.js

@@ -7,12 +7,14 @@ const DatabaseTable_1 = require("./DatabaseTable");
  * @internal
  */
 class DatabaseSchema {
+    platform;
+    name;
+    tables = [];
+    namespaces = new Set();
+    nativeEnums = {}; // for postgres
     constructor(platform, name) {
         this.platform = platform;
         this.name = name;
-        this.tables = [];
-        this.namespaces = new Set();
-        this.nativeEnums = {}; // for postgres
     }
     addTable(name, schema, comment) {
         const namespaceName = schema ?? this.name;

package/schema/DatabaseTable.js

@@ -6,15 +6,19 @@ const core_1 = require("@mikro-orm/core");
  * @internal
  */
 class DatabaseTable {
+    platform;
+    name;
+    schema;
+    columns = {};
+    indexes = [];
+    checks = [];
+    foreignKeys = {};
+    nativeEnums = {}; // for postgres
+    comment;
     constructor(platform, name, schema) {
         this.platform = platform;
         this.name = name;
         this.schema = schema;
-        this.columns = {};
-        this.indexes = [];
-        this.checks = [];
-        this.foreignKeys = {};
-        this.nativeEnums = {}; // for postgres
         Object.defineProperties(this, {
             platform: { enumerable: false, writable: true },
         });

package/schema/SchemaComparator.js

@@ -7,6 +7,9 @@ const core_1 = require("@mikro-orm/core");
  * Compares two Schemas and return an instance of SchemaDifference.
  */
 class SchemaComparator {
+    platform;
+    helper;
+    logger;
     constructor(platform) {
         this.platform = platform;
         this.helper = this.platform.getSchemaHelper();

package/schema/SchemaHelper.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaHelper = void 0;
 const core_1 = require("@mikro-orm/core");
 class SchemaHelper {
+    platform;
     constructor(platform) {
         this.platform = platform;
     }

package/schema/SqlSchemaGenerator.js

@@ -5,11 +5,9 @@ const core_1 = require("@mikro-orm/core");
 const DatabaseSchema_1 = require("./DatabaseSchema");
 const SchemaComparator_1 = require("./SchemaComparator");
 class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
-    constructor() {
-        super(...arguments);
-        this.helper = this.platform.getSchemaHelper();
-        this.options = this.config.get('schemaGenerator');
-    }
+    helper = this.platform.getSchemaHelper();
+    options = this.config.get('schemaGenerator');
+    lastEnsuredDatabase;
     static register(orm) {
         orm.config.registerExtension('@mikro-orm/schema-generator', () => new SqlSchemaGenerator(orm.em));
     }