@mikro-orm/knex 7.0.0-dev.65 → 7.0.0-dev.67

package/dialects/sqlite/BaseSqlitePlatform.js

@@ -1,4 +1,3 @@
-import { Utils } from '@mikro-orm/core';
 import { AbstractSqlPlatform } from '../../AbstractSqlPlatform.js';
 import { SqliteNativeQueryBuilder } from './SqliteNativeQueryBuilder.js';
 import { SqliteSchemaHelper } from './SqliteSchemaHelper.js';
@@ -29,7 +28,7 @@ export class BaseSqlitePlatform extends AbstractSqlPlatform {
         return ['begin'];
     }
     getEnumTypeDeclarationSQL(column) {
-        if (column.items?.every(item => Utils.isString(item))) {
+        if (column.items?.every(item => typeof item === 'string')) {
             return 'text';
         }
         /* v8 ignore next */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.65",
+  "version": "7.0.0-dev.67",
   "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.",
   "type": "module",
   "exports": {
@@ -57,6 +57,6 @@
     "@mikro-orm/core": "^6.6.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.65"
+    "@mikro-orm/core": "7.0.0-dev.67"
   }
 }

package/query/CriteriaNodeFactory.js

@@ -1,4 +1,4 @@
-import { isRaw, JsonType, RawQueryFragment, ReferenceKind, Utils, ValidationError, } from '@mikro-orm/core';
+import { GroupOperator, isRaw, JsonType, RawQueryFragment, ReferenceKind, Utils, ValidationError, } from '@mikro-orm/core';
 import { ObjectCriteriaNode } from './ObjectCriteriaNode.js';
 import { ArrayCriteriaNode } from './ArrayCriteriaNode.js';
 import { ScalarCriteriaNode } from './ScalarCriteriaNode.js';
@@ -50,7 +50,7 @@ export class CriteriaNodeFactory {
         if (isNotEmbedded && prop?.customType instanceof JsonType) {
             return this.createScalarNode(metadata, childEntity, payload[key], node, key);
         }
-        if (prop?.kind === ReferenceKind.SCALAR && payload[key] != null && Object.keys(payload[key]).some(f => Utils.isGroupOperator(f))) {
+        if (prop?.kind === ReferenceKind.SCALAR && payload[key] != null && Object.keys(payload[key]).some(f => f in GroupOperator)) {
             throw ValidationError.cannotUseGroupOperatorsInsideScalars(entityName, prop.name, payload);
         }
         if (isNotEmbedded) {

package/query/ObjectCriteriaNode.js

@@ -1,4 +1,4 @@
-import { ALIAS_REPLACEMENT, QueryFlag, raw, RawQueryFragment, ReferenceKind, Utils, } from '@mikro-orm/core';
+import { ALIAS_REPLACEMENT, GroupOperator, QueryFlag, raw, RawQueryFragment, ReferenceKind, Utils, } from '@mikro-orm/core';
 import { CriteriaNode } from './CriteriaNode.js';
 import { JoinType, QueryType } from './enums.js';
 /**
@@ -160,7 +160,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
                 delete payload[k];
                 o[this.aliased(field, alias)] = { [k]: tmp, ...o[this.aliased(field, alias)] };
             }
-            else if (Utils.isGroupOperator(k) && Array.isArray(payload[k])) {
+            else if (k in GroupOperator && Array.isArray(payload[k])) {
                 this.inlineArrayChildPayload(o, payload[k], k, prop, childAlias, alias);
             }
             else if (this.isPrefixed(k) || Utils.isOperator(k) || !childAlias) {

package/query/QueryBuilder.js

@@ -313,7 +313,7 @@ export class QueryBuilder {
             cond = { [raw(`(${sql})`)]: Utils.asArray(params) };
             operator ??= '$and';
         }
-        else if (Utils.isString(cond)) {
+        else if (typeof cond === 'string') {
             cond = { [raw(`(${cond})`, Utils.asArray(params))]: [] };
             operator ??= '$and';
         }
@@ -392,7 +392,7 @@ export class QueryBuilder {
     }
     having(cond = {}, params, operator) {
         this.ensureNotFinalized();
-        if (Utils.isString(cond)) {
+        if (typeof cond === 'string') {
             cond = { [raw(`(${cond})`, params)]: [] };
         }
         cond = CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, cond).process(this);
@@ -1035,7 +1035,7 @@ export class QueryBuilder {
                 ret.push(rawField);
                 return;
             }
-            if (!Utils.isString(field)) {
+            if (typeof field !== 'string') {
                 ret.push(field);
                 return;
             }

package/query/QueryBuilderHelper.js

@@ -539,7 +539,7 @@ export class QueryBuilderHelper {
         const ret = [];
         for (const key of Object.keys(orderBy)) {
             const direction = orderBy[key];
-            const order = Utils.isNumber(direction) ? QueryOrderNumeric[direction] : direction;
+            const order = typeof direction === 'number' ? QueryOrderNumeric[direction] : direction;
             const raw = RawQueryFragment.getKnownFragment(key);
             if (raw) {
                 ret.push(...this.platform.getOrderByExpression(this.platform.formatQuery(raw.sql, raw.params), order));
@@ -553,7 +553,7 @@ export class QueryBuilderHelper {
                 const noPrefix = (prop?.persist === false && !prop.formula && !prop.embedded) || RawQueryFragment.isKnownFragment(f);
                 const column = this.mapper(noPrefix ? field : `${alias}.${field}`, type, undefined, null);
                 /* v8 ignore next */
-                const rawColumn = Utils.isString(column) ? column.split('.').map(e => this.platform.quoteIdentifier(e)).join('.') : column;
+                const rawColumn = typeof column === 'string' ? column.split('.').map(e => this.platform.quoteIdentifier(e)).join('.') : column;
                 const customOrder = prop?.customOrder;
                 let colPart = customOrder
                     ? this.platform.generateCustomOrder(rawColumn, customOrder)

package/query/ScalarCriteriaNode.js

@@ -1,4 +1,4 @@
-import { ReferenceKind, Utils } from '@mikro-orm/core';
+import { ARRAY_OPERATORS, ReferenceKind } from '@mikro-orm/core';
 import { CriteriaNode } from './CriteriaNode.js';
 import { JoinType, QueryType } from './enums.js';
 import { QueryBuilder } from './QueryBuilder.js';
@@ -25,7 +25,7 @@ export class ScalarCriteriaNode extends CriteriaNode {
             return this.payload.getNativeQuery().toRaw();
         }
         if (this.payload && typeof this.payload === 'object') {
-            const keys = Object.keys(this.payload).filter(key => Utils.isArrayOperator(key) && Array.isArray(this.payload[key]));
+            const keys = Object.keys(this.payload).filter(key => ARRAY_OPERATORS.includes(key) && Array.isArray(this.payload[key]));
             for (const key of keys) {
                 this.payload[key] = JSON.stringify(this.payload[key]);
             }

package/schema/DatabaseTable.d.ts

@@ -1,4 +1,4 @@
-import { type Configuration, type DeferMode, type Dictionary, type EntityMetadata, type EntityProperty, type NamingStrategy, type IndexCallback } from '@mikro-orm/core';
+import { type Configuration, type DeferMode, type Dictionary, type EntityMetadata, type EntityProperty, type IndexCallback, type NamingStrategy } from '@mikro-orm/core';
 import type { SchemaHelper } from './SchemaHelper.js';
 import type { CheckDef, Column, ForeignKey, IndexDef } from '../typings.js';
 import type { AbstractSqlPlatform } from '../AbstractSqlPlatform.js';

package/schema/DatabaseTable.js

@@ -1,4 +1,4 @@
-import { Cascade, DecimalType, EntitySchema, ReferenceKind, t, Type, UnknownType, Utils, RawQueryFragment, } from '@mikro-orm/core';
+import { Cascade, DecimalType, EntitySchema, RawQueryFragment, ReferenceKind, t, Type, UnknownType, Utils, } from '@mikro-orm/core';
 /**
  * @internal
  */
@@ -91,7 +91,7 @@ export class DatabaseTable {
                 precision: prop.precision,
                 scale: prop.scale,
                 default: prop.defaultRaw,
-                enumItems: prop.nativeEnumName || prop.items?.every(Utils.isString) ? prop.items : undefined,
+                enumItems: prop.nativeEnumName || prop.items?.every(i => typeof i === 'string') ? prop.items : undefined,
                 comment: prop.comment,
                 extra: prop.extra,
                 ignoreSchemaChanges: prop.ignoreSchemaChanges,
@@ -162,7 +162,7 @@ export class DatabaseTable {
         }
     }
     getIndexName(value, columnNames, type) {
-        if (Utils.isString(value)) {
+        if (typeof value === 'string') {
             return value;
         }
         return this.platform.getIndexName(this.name, columnNames, type);