@mikro-orm/knex 6.0.0-dev.216 → 6.0.0-dev.219

package/package.json

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

package/query/CriteriaNode.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { inspect } from 'util';
-import { type EntityProperty, type MetadataStorage, type EntityKey } from '@mikro-orm/core';
+import { type EntityKey, type EntityProperty, type MetadataStorage } from '@mikro-orm/core';
 import type { ICriteriaNode, ICriteriaNodeProcessOptions, IQueryBuilder } from '../typings';
 /**
  * Helper for working with deeply nested where/orderBy/having criteria. Uses composite pattern to build tree from the payload.
@@ -28,5 +28,4 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     aliased(field: string, alias?: string): string;
     /** @ignore */
     [inspect.custom](): string;
-    static isCustomExpression(field: string): boolean;
 }

package/query/CriteriaNode.js

@@ -31,7 +31,7 @@ class CriteriaNode {
                 this.prop = meta.props.find(prop => prop.name === k || (prop.fieldNames?.length === 1 && prop.fieldNames[0] === k));
                 const isProp = this.prop || meta.props.find(prop => (prop.fieldNames || []).includes(k));
                 // do not validate if the key is prefixed or type casted (e.g. `k::text`)
-                if (validate && !isProp && !k.includes('.') && !k.includes('::') && !core_1.Utils.isOperator(k) && !CriteriaNode.isCustomExpression(k)) {
+                if (validate && !isProp && !k.includes('.') && !k.includes('::') && !core_1.Utils.isOperator(k) && !core_1.RawQueryFragment.isKnownFragment(k)) {
                     throw new Error(`Trying to query by not existing property ${entityName}.${k}`);
                 }
             });
@@ -52,7 +52,7 @@ class CriteriaNode {
     shouldRename(payload) {
         const type = this.prop ? this.prop.kind : null;
         const composite = this.prop?.joinColumns ? this.prop.joinColumns.length > 1 : false;
-        const customExpression = CriteriaNode.isCustomExpression(this.key);
+        const customExpression = core_1.RawQueryFragment.isKnownFragment(this.key);
         const scalar = payload === null || core_1.Utils.isPrimaryKey(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
         const plainObject = core_1.Utils.isPlainObject(payload);
         const keys = plainObject ? Object.keys(payload) : [];
@@ -98,7 +98,7 @@ class CriteriaNode {
         if (!this.key || !this.prop) {
             return false;
         }
-        const customExpression = CriteriaNode.isCustomExpression(this.key);
+        const customExpression = core_1.RawQueryFragment.isKnownFragment(this.key);
         const scalar = this.payload === null || core_1.Utils.isPrimaryKey(this.payload) || this.payload instanceof RegExp || this.payload instanceof Date || customExpression;
         const operator = core_1.Utils.isObject(this.payload) && Object.keys(this.payload).every(k => core_1.Utils.isOperator(k, false));
         return this.prop.kind === core_1.ReferenceKind.MANY_TO_MANY && (scalar || operator);
@@ -117,8 +117,5 @@ class CriteriaNode {
             .forEach(k => o[k] = this[k]);
         return `${this.constructor.name} ${(0, util_1.inspect)(o)}`;
     }
-    static isCustomExpression(field) {
-        return !!field.match(/[ ?<>=()]|^\d/);
-    }
 }
 exports.CriteriaNode = CriteriaNode;

package/query/CriteriaNodeFactory.d.ts

@@ -1,4 +1,4 @@
-import { type Dictionary, type EntityMetadata, type MetadataStorage, type EntityKey } from '@mikro-orm/core';
+import { type Dictionary, type EntityKey, type EntityMetadata, type MetadataStorage } from '@mikro-orm/core';
 import type { ICriteriaNode } from '../typings';
 /**
  * @internal

package/query/CriteriaNodeFactory.js

@@ -5,13 +5,12 @@ const core_1 = require("@mikro-orm/core");
 const ObjectCriteriaNode_1 = require("./ObjectCriteriaNode");
 const ArrayCriteriaNode_1 = require("./ArrayCriteriaNode");
 const ScalarCriteriaNode_1 = require("./ScalarCriteriaNode");
-const CriteriaNode_1 = require("./CriteriaNode");
 /**
  * @internal
  */
 class CriteriaNodeFactory {
     static createNode(metadata, entityName, payload, parent, key) {
-        const customExpression = CriteriaNode_1.CriteriaNode.isCustomExpression(key || '');
+        const customExpression = core_1.RawQueryFragment.isKnownFragment(key || '');
         const scalar = core_1.Utils.isPrimaryKey(payload) || core_1.Utils.isRawSql(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
         if (Array.isArray(payload) && !scalar) {
             return this.createArrayNode(metadata, entityName, payload, parent, key);

package/query/ObjectCriteriaNode.d.ts

@@ -1,5 +1,5 @@
 import { CriteriaNode } from './CriteriaNode';
-import type { IQueryBuilder, ICriteriaNodeProcessOptions } from '../typings';
+import type { ICriteriaNodeProcessOptions, IQueryBuilder } from '../typings';
 /**
  * @internal
  */

package/query/ObjectCriteriaNode.js

@@ -95,7 +95,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         });
     }
     shouldInline(payload) {
-        const customExpression = ObjectCriteriaNode.isCustomExpression(this.key);
+        const customExpression = core_1.RawQueryFragment.isKnownFragment(this.key);
         const scalar = core_1.Utils.isPrimaryKey(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
         const operator = core_1.Utils.isObject(payload) && Object.keys(payload).every(k => core_1.Utils.isOperator(k, false));
         return !!this.prop && this.prop.kind !== core_1.ReferenceKind.SCALAR && !scalar && !operator;
@@ -128,7 +128,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
                     o[key] = payload[k];
                 }
             }
-            else if (ObjectCriteriaNode.isCustomExpression(k)) {
+            else if (core_1.RawQueryFragment.isKnownFragment(k)) {
                 o[k] = payload[k];
             }
             else {
@@ -158,7 +158,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
     }
     autoJoin(qb, alias) {
         const nestedAlias = qb.getNextAlias(this.prop?.pivotTable ?? this.entityName);
-        const customExpression = ObjectCriteriaNode.isCustomExpression(this.key);
+        const customExpression = core_1.RawQueryFragment.isKnownFragment(this.key);
         const scalar = core_1.Utils.isPrimaryKey(this.payload) || this.payload instanceof RegExp || this.payload instanceof Date || customExpression;
         const operator = core_1.Utils.isPlainObject(this.payload) && Object.keys(this.payload).every(k => core_1.Utils.isOperator(k, false));
         const field = `${alias}.${this.prop.name}`;