@mikro-orm/knex 7.0.0-dev.1 → 7.0.0-dev.10

package/index.d.ts

@@ -2,17 +2,17 @@
  * @packageDocumentation
  * @module knex
  */
-export * from './AbstractSqlConnection';
-export * from './AbstractSqlDriver';
-export * from './AbstractSqlPlatform';
-export * from './SqlEntityManager';
-export * from './SqlEntityRepository';
-export * from './query';
-export * from './schema';
-export * from './dialects';
-export * from './typings';
-export { SqlEntityManager as EntityManager } from './SqlEntityManager';
-export { SqlEntityRepository as EntityRepository } from './SqlEntityRepository';
 /** @ignore */
 export { Kysely } from 'kysely';
 export * from '@mikro-orm/core';
+export * from './AbstractSqlConnection.js';
+export * from './AbstractSqlDriver.js';
+export * from './AbstractSqlPlatform.js';
+export * from './SqlEntityManager.js';
+export * from './SqlEntityRepository.js';
+export * from './query/index.js';
+export * from './schema/index.js';
+export * from './dialects/index.js';
+export * from './typings.js';
+export { SqlEntityManager as EntityManager } from './SqlEntityManager.js';
+export { SqlEntityRepository as EntityRepository } from './SqlEntityRepository.js';

package/index.js

@@ -1,39 +1,18 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Kysely = exports.EntityRepository = exports.EntityManager = void 0;
 /**
  * @packageDocumentation
  * @module knex
  */
-/* istanbul ignore file */
-__exportStar(require("./AbstractSqlConnection"), exports);
-__exportStar(require("./AbstractSqlDriver"), exports);
-__exportStar(require("./AbstractSqlPlatform"), exports);
-__exportStar(require("./SqlEntityManager"), exports);
-__exportStar(require("./SqlEntityRepository"), exports);
-__exportStar(require("./query"), exports);
-__exportStar(require("./schema"), exports);
-__exportStar(require("./dialects"), exports);
-__exportStar(require("./typings"), exports);
-var SqlEntityManager_1 = require("./SqlEntityManager");
-Object.defineProperty(exports, "EntityManager", { enumerable: true, get: function () { return SqlEntityManager_1.SqlEntityManager; } });
-var SqlEntityRepository_1 = require("./SqlEntityRepository");
-Object.defineProperty(exports, "EntityRepository", { enumerable: true, get: function () { return SqlEntityRepository_1.SqlEntityRepository; } });
 /** @ignore */
-var kysely_1 = require("kysely");
-Object.defineProperty(exports, "Kysely", { enumerable: true, get: function () { return kysely_1.Kysely; } });
-__exportStar(require("@mikro-orm/core"), exports);
+export { Kysely } from 'kysely';
+export * from '@mikro-orm/core';
+export * from './AbstractSqlConnection.js';
+export * from './AbstractSqlDriver.js';
+export * from './AbstractSqlPlatform.js';
+export * from './SqlEntityManager.js';
+export * from './SqlEntityRepository.js';
+export * from './query/index.js';
+export * from './schema/index.js';
+export * from './dialects/index.js';
+export * from './typings.js';
+export { SqlEntityManager as EntityManager } from './SqlEntityManager.js';
+export { SqlEntityRepository as EntityRepository } from './SqlEntityRepository.js';

package/package.json

@@ -1,19 +1,11 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.1",
+  "version": "7.0.0-dev.10",
   "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",
-  "typings": "index.d.ts",
+  "type": "module",
   "exports": {
     "./package.json": "./package.json",
-    ".": {
-      "import": {
-        "types": "./index.d.ts",
-        "default": "./index.mjs"
-      },
-      "require": "./index.js"
-    }
+    ".": "./index.js"
   },
   "repository": {
     "type": "git",
@@ -49,7 +41,7 @@
     "node": ">= 22.11.0"
   },
   "scripts": {
-    "build": "yarn clean && yarn compile && yarn copy && yarn run -T gen-esm-wrapper index.js index.mjs",
+    "build": "yarn clean && yarn compile && yarn copy",
     "clean": "yarn run -T rimraf ./dist",
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
@@ -58,14 +50,13 @@
     "access": "public"
   },
   "dependencies": {
-    "fs-extra": "11.3.0",
-    "kysely": "https://pkg.pr.new/kysely-org/kysely/kysely@2b7007e",
+    "kysely": "0.28.0",
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.5"
+    "@mikro-orm/core": "^6.4.13"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.1"
+    "@mikro-orm/core": "7.0.0-dev.10"
   }
 }

package/query/ArrayCriteriaNode.d.ts

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

package/query/ArrayCriteriaNode.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArrayCriteriaNode = void 0;
-const CriteriaNode_1 = require("./CriteriaNode");
+import { CriteriaNode } from './CriteriaNode.js';
 /**
  * @internal
  */
-class ArrayCriteriaNode extends CriteriaNode_1.CriteriaNode {
+export class ArrayCriteriaNode extends CriteriaNode {
     process(qb, options) {
         return this.payload.map((node) => {
             return node.process(qb, options);
@@ -22,4 +19,3 @@ class ArrayCriteriaNode extends CriteriaNode_1.CriteriaNode {
         });
     }
 }
-exports.ArrayCriteriaNode = ArrayCriteriaNode;

package/query/CriteriaNode.d.ts

@@ -1,6 +1,6 @@
 import { inspect } from 'node:util';
 import { type EntityKey, type EntityProperty, type MetadataStorage } from '@mikro-orm/core';
-import type { ICriteriaNode, ICriteriaNodeProcessOptions, IQueryBuilder } from '../typings';
+import type { ICriteriaNode, ICriteriaNodeProcessOptions, IQueryBuilder } from '../typings.js';
 /**
  * Helper for working with deeply nested where/orderBy/having criteria. Uses composite pattern to build tree from the payload.
  * Auto-joins relations and converts payload from { books: { publisher: { name: '...' } } } to { 'publisher_alias.name': '...' }

package/query/CriteriaNode.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CriteriaNode = void 0;
-const node_util_1 = require("node:util");
-const core_1 = require("@mikro-orm/core");
+import { inspect } from 'node:util';
+import { RawQueryFragment, ReferenceKind, Utils, } from '@mikro-orm/core';
 /**
  * Helper for working with deeply nested where/orderBy/having criteria. Uses composite pattern to build tree from the payload.
  * Auto-joins relations and converts payload from { books: { publisher: { name: '...' } } } to { 'publisher_alias.name': '...' }
  * @internal
  */
-class CriteriaNode {
+export class CriteriaNode {
     metadata;
     entityName;
     parent;
@@ -23,7 +20,7 @@ class CriteriaNode {
         this.key = key;
         const meta = parent && metadata.find(parent.entityName);
         if (meta && key) {
-            const pks = core_1.Utils.splitPrimaryKeys(key);
+            const pks = Utils.splitPrimaryKeys(key);
             if (pks.length > 1) {
                 return;
             }
@@ -31,7 +28,7 @@ class CriteriaNode {
                 this.prop = meta.props.find(prop => prop.name === k || (prop.fieldNames?.length === 1 && prop.fieldNames[0] === k && prop.persist !== false));
                 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) && !core_1.RawQueryFragment.isKnownFragment(k)) {
+                if (validate && !isProp && !k.includes('.') && !k.includes('::') && !Utils.isOperator(k) && !RawQueryFragment.isKnownFragment(k)) {
                     throw new Error(`Trying to query by not existing property ${entityName}.${k}`);
                 }
             }
@@ -52,41 +49,37 @@ 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 = 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 customExpression = RawQueryFragment.isKnownFragment(this.key);
+        const scalar = payload === null || Utils.isPrimaryKey(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
+        const plainObject = Utils.isPlainObject(payload);
         const keys = plainObject ? Object.keys(payload) : [];
-        const operator = plainObject && keys.every(k => core_1.Utils.isOperator(k, false));
+        const operator = plainObject && keys.every(k => Utils.isOperator(k, false));
         if (composite) {
             return true;
         }
         switch (type) {
-            case core_1.ReferenceKind.MANY_TO_ONE: return false;
-            case core_1.ReferenceKind.ONE_TO_ONE: return !this.prop.owner;
-            case core_1.ReferenceKind.ONE_TO_MANY: return scalar || operator;
-            case core_1.ReferenceKind.MANY_TO_MANY: return scalar || operator;
+            case ReferenceKind.MANY_TO_ONE: return false;
+            case ReferenceKind.ONE_TO_ONE: return !this.prop.owner;
+            case ReferenceKind.ONE_TO_MANY: return scalar || operator;
+            case ReferenceKind.MANY_TO_MANY: return scalar || operator;
             default: return false;
         }
     }
     renameFieldToPK(qb) {
         let joinAlias = qb.getAliasForJoinPath(this.getPath());
-        if (!joinAlias && this.parent && [core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(this.prop.kind) && this.prop.owner) {
+        if (!joinAlias && this.parent && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(this.prop.kind) && this.prop.owner) {
             joinAlias = qb.getAliasForJoinPath(this.parent.getPath());
-            return core_1.Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${joinAlias ?? qb.alias}.${col}`));
+            return Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${joinAlias ?? qb.alias}.${col}`));
         }
         const alias = joinAlias ?? qb.alias;
-        if (this.prop.kind === core_1.ReferenceKind.MANY_TO_MANY) {
-            return core_1.Utils.getPrimaryKeyHash(this.prop.inverseJoinColumns.map(col => `${alias}.${col}`));
+        if (this.prop.kind === ReferenceKind.MANY_TO_MANY) {
+            return Utils.getPrimaryKeyHash(this.prop.inverseJoinColumns.map(col => `${alias}.${col}`));
         }
-        // if we found a matching join, we need to use the target table column names, as we use that alias instead of the root
-        if (!joinAlias && this.prop.owner && this.prop.joinColumns.length > 1) {
-            return core_1.Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${alias}.${col}`));
-        }
-        return core_1.Utils.getPrimaryKeyHash(this.prop.referencedColumnNames.map(col => `${alias}.${col}`));
+        return Utils.getPrimaryKeyHash(this.prop.referencedColumnNames.map(col => `${alias}.${col}`));
     }
     getPath(addIndex = false) {
         // use index on parent only if we are processing to-many relation
-        const addParentIndex = this.prop && [core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(this.prop.kind);
+        const addParentIndex = this.prop && [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(this.prop.kind);
         const parentPath = this.parent?.getPath(addParentIndex) ?? this.entityName;
         const index = addIndex && this.index != null ? `[${this.index}]` : '';
         // ignore group operators to allow easier mapping (e.g. for orderBy)
@@ -102,10 +95,10 @@ class CriteriaNode {
         if (!this.key || !this.prop) {
             return false;
         }
-        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);
+        const customExpression = RawQueryFragment.isKnownFragment(this.key);
+        const scalar = this.payload === null || Utils.isPrimaryKey(this.payload) || this.payload instanceof RegExp || this.payload instanceof Date || customExpression;
+        const operator = Utils.isObject(this.payload) && Object.keys(this.payload).every(k => Utils.isOperator(k, false));
+        return this.prop.kind === ReferenceKind.MANY_TO_MANY && (scalar || operator);
     }
     getPivotPath(path) {
         return `${path}[pivot]`;
@@ -114,12 +107,11 @@ class CriteriaNode {
         return alias ? `${alias}.${field}` : field;
     }
     /** @ignore */
-    [node_util_1.inspect.custom]() {
+    [inspect.custom]() {
         const o = {};
         ['entityName', 'key', 'index', 'payload']
             .filter(k => this[k] !== undefined)
             .forEach(k => o[k] = this[k]);
-        return `${this.constructor.name} ${(0, node_util_1.inspect)(o)}`;
+        return `${this.constructor.name} ${inspect(o)}`;
     }
 }
-exports.CriteriaNode = CriteriaNode;

package/query/CriteriaNodeFactory.d.ts

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

package/query/CriteriaNodeFactory.js

@@ -1,32 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CriteriaNodeFactory = void 0;
-const core_1 = require("@mikro-orm/core");
-const ObjectCriteriaNode_1 = require("./ObjectCriteriaNode");
-const ArrayCriteriaNode_1 = require("./ArrayCriteriaNode");
-const ScalarCriteriaNode_1 = require("./ScalarCriteriaNode");
+import { 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';
 /**
  * @internal
  */
-class CriteriaNodeFactory {
+export class CriteriaNodeFactory {
     static createNode(metadata, entityName, payload, parent, key) {
-        const customExpression = core_1.RawQueryFragment.isKnownFragment(key || '');
-        const scalar = core_1.Utils.isPrimaryKey(payload) || (0, core_1.isRaw)(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
+        const customExpression = RawQueryFragment.isKnownFragment(key || '');
+        const scalar = Utils.isPrimaryKey(payload) || isRaw(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
         if (Array.isArray(payload) && !scalar) {
             return this.createArrayNode(metadata, entityName, payload, parent, key);
         }
-        if (core_1.Utils.isPlainObject(payload) && !scalar) {
+        if (Utils.isPlainObject(payload) && !scalar) {
             return this.createObjectNode(metadata, entityName, payload, parent, key);
         }
         return this.createScalarNode(metadata, entityName, payload, parent, key);
     }
     static createScalarNode(metadata, entityName, payload, parent, key) {
-        const node = new ScalarCriteriaNode_1.ScalarCriteriaNode(metadata, entityName, parent, key);
+        const node = new ScalarCriteriaNode(metadata, entityName, parent, key);
         node.payload = payload;
         return node;
     }
     static createArrayNode(metadata, entityName, payload, parent, key) {
-        const node = new ArrayCriteriaNode_1.ArrayCriteriaNode(metadata, entityName, parent, key);
+        const node = new ArrayCriteriaNode(metadata, entityName, parent, key);
         node.payload = payload.map((item, index) => {
             const n = this.createNode(metadata, entityName, item, node);
             // we care about branching only for $and
@@ -39,7 +36,7 @@ class CriteriaNodeFactory {
     }
     static createObjectNode(metadata, entityName, payload, parent, key) {
         const meta = metadata.find(entityName);
-        const node = new ObjectCriteriaNode_1.ObjectCriteriaNode(metadata, entityName, parent, key);
+        const node = new ObjectCriteriaNode(metadata, entityName, parent, key);
         node.payload = {};
         for (const key of Object.keys(payload)) {
             node.payload[key] = this.createObjectItemNode(metadata, entityName, node, payload, key, meta);
@@ -48,11 +45,11 @@ class CriteriaNodeFactory {
     }
     static createObjectItemNode(metadata, entityName, node, payload, key, meta) {
         const prop = meta?.properties[key];
-        const childEntity = prop && prop.kind !== core_1.ReferenceKind.SCALAR ? prop.type : entityName;
-        if (prop?.customType instanceof core_1.JsonType) {
+        const childEntity = prop && prop.kind !== ReferenceKind.SCALAR ? prop.type : entityName;
+        if (prop?.customType instanceof JsonType) {
             return this.createScalarNode(metadata, childEntity, payload[key], node, key);
         }
-        if (prop?.kind !== core_1.ReferenceKind.EMBEDDED) {
+        if (prop?.kind !== ReferenceKind.EMBEDDED) {
             return this.createNode(metadata, childEntity, payload[key], node, key);
         }
         if (payload[key] == null) {
@@ -64,13 +61,13 @@ class CriteriaNodeFactory {
         }
         // array operators can be used on embedded properties
         const allowedOperators = ['$contains', '$contained', '$overlap'];
-        const operator = Object.keys(payload[key]).some(f => core_1.Utils.isOperator(f) && !allowedOperators.includes(f));
+        const operator = Object.keys(payload[key]).some(f => Utils.isOperator(f) && !allowedOperators.includes(f));
         if (operator) {
-            throw core_1.ValidationError.cannotUseOperatorsInsideEmbeddables(entityName, prop.name, payload);
+            throw ValidationError.cannotUseOperatorsInsideEmbeddables(entityName, prop.name, payload);
         }
         const map = Object.keys(payload[key]).reduce((oo, k) => {
             if (!prop.embeddedProps[k] && !allowedOperators.includes(k)) {
-                throw core_1.ValidationError.invalidEmbeddableQuery(entityName, k, prop.type);
+                throw ValidationError.invalidEmbeddableQuery(entityName, k, prop.type);
             }
             if (prop.embeddedProps[k]) {
                 oo[prop.embeddedProps[k].name] = payload[key][k];
@@ -86,4 +83,3 @@ class CriteriaNodeFactory {
         return this.createNode(metadata, entityName, map, node, key);
     }
 }
-exports.CriteriaNodeFactory = CriteriaNodeFactory;

package/query/NativeQueryBuilder.d.ts

@@ -1,6 +1,6 @@
 import { type Dictionary, LockMode, type QueryFlag, RawQueryFragment } from '@mikro-orm/core';
-import { QueryType } from './enums';
-import type { AbstractSqlPlatform } from '../AbstractSqlPlatform';
+import { QueryType } from './enums.js';
+import type { AbstractSqlPlatform } from '../AbstractSqlPlatform.js';
 interface Options {
     tableName?: string | RawQueryFragment;
     indexHint?: string;

package/query/NativeQueryBuilder.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NativeQueryBuilder = void 0;
-const core_1 = require("@mikro-orm/core");
-const enums_1 = require("./enums");
+import { LockMode, raw, RawQueryFragment, Utils } from '@mikro-orm/core';
+import { QueryType } from './enums.js';
 /** @internal */
-class NativeQueryBuilder {
+export class NativeQueryBuilder {
     platform;
     type;
     parts = [];
@@ -14,14 +11,14 @@ class NativeQueryBuilder {
         this.platform = platform;
     }
     select(fields) {
-        this.type = enums_1.QueryType.SELECT;
+        this.type = QueryType.SELECT;
         this.options.select ??= [];
-        this.options.select.push(...core_1.Utils.asArray(fields));
+        this.options.select.push(...Utils.asArray(fields));
         return this;
     }
     count(fields = '*', distinct) {
-        this.type = enums_1.QueryType.COUNT;
-        this.options.select = core_1.Utils.asArray(fields);
+        this.type = QueryType.COUNT;
+        this.options.select = Utils.asArray(fields);
         this.options.distinct = distinct;
         return this;
     }
@@ -31,7 +28,7 @@ class NativeQueryBuilder {
     from(tableName, options) {
         if (tableName instanceof NativeQueryBuilder) {
             const { sql, params } = tableName.compile();
-            tableName = (0, core_1.raw)(sql, params);
+            tableName = raw(sql, params);
         }
         if (typeof tableName === 'string') {
             const alias = options?.alias ? ` as ${this.platform.quoteIdentifier(options.alias)}` : '';
@@ -77,20 +74,20 @@ class NativeQueryBuilder {
             this.parts.push(...this.options.comment.map(comment => `/* ${comment} */`));
         }
         switch (this.type) {
-            case enums_1.QueryType.SELECT:
-            case enums_1.QueryType.COUNT:
+            case QueryType.SELECT:
+            case QueryType.COUNT:
                 this.compileSelect();
                 break;
-            case enums_1.QueryType.INSERT:
+            case QueryType.INSERT:
                 this.compileInsert();
                 break;
-            case enums_1.QueryType.UPDATE:
+            case QueryType.UPDATE:
                 this.compileUpdate();
                 break;
-            case enums_1.QueryType.DELETE:
+            case QueryType.DELETE:
                 this.compileDelete();
                 break;
-            case enums_1.QueryType.TRUNCATE:
+            case QueryType.TRUNCATE:
                 this.compileTruncate();
                 break;
         }
@@ -106,20 +103,20 @@ class NativeQueryBuilder {
         if (!this.options.lockMode) {
             return;
         }
-        if ([core_1.LockMode.PESSIMISTIC_READ, core_1.LockMode.PESSIMISTIC_PARTIAL_READ, core_1.LockMode.PESSIMISTIC_READ_OR_FAIL].includes(this.options.lockMode)) {
+        if ([LockMode.PESSIMISTIC_READ, LockMode.PESSIMISTIC_PARTIAL_READ, LockMode.PESSIMISTIC_READ_OR_FAIL].includes(this.options.lockMode)) {
             this.parts.push('for share');
         }
-        if ([core_1.LockMode.PESSIMISTIC_WRITE, core_1.LockMode.PESSIMISTIC_PARTIAL_WRITE, core_1.LockMode.PESSIMISTIC_WRITE_OR_FAIL].includes(this.options.lockMode)) {
+        if ([LockMode.PESSIMISTIC_WRITE, LockMode.PESSIMISTIC_PARTIAL_WRITE, LockMode.PESSIMISTIC_WRITE_OR_FAIL].includes(this.options.lockMode)) {
             this.parts.push('for update');
         }
         if (this.options.lockTables?.length) {
             const fields = this.options.lockTables.map(field => this.quote(field));
             this.parts.push(`of ${fields.join(', ')}`);
         }
-        if ([core_1.LockMode.PESSIMISTIC_PARTIAL_READ, core_1.LockMode.PESSIMISTIC_PARTIAL_WRITE].includes(this.options.lockMode)) {
+        if ([LockMode.PESSIMISTIC_PARTIAL_READ, LockMode.PESSIMISTIC_PARTIAL_WRITE].includes(this.options.lockMode)) {
             this.parts.push('skip locked');
         }
-        if ([core_1.LockMode.PESSIMISTIC_READ_OR_FAIL, core_1.LockMode.PESSIMISTIC_WRITE_OR_FAIL].includes(this.options.lockMode)) {
+        if ([LockMode.PESSIMISTIC_READ_OR_FAIL, LockMode.PESSIMISTIC_WRITE_OR_FAIL].includes(this.options.lockMode)) {
             this.parts.push('nowait');
         }
     }
@@ -129,7 +126,7 @@ class NativeQueryBuilder {
             return;
         }
         this.parts.push('on conflict');
-        if (clause.fields instanceof core_1.RawQueryFragment) {
+        if (clause.fields instanceof RawQueryFragment) {
             this.parts.push(clause.fields.sql);
             this.params.push(...clause.fields.params);
         }
@@ -140,7 +137,7 @@ class NativeQueryBuilder {
         if (clause.ignore) {
             this.parts.push('do nothing');
         }
-        if (core_1.Utils.isObject(clause.merge)) {
+        if (Utils.isObject(clause.merge)) {
             this.parts.push('do update set');
             const fields = Object.keys(clause.merge).map(field => {
                 this.params.push(clause.merge[field]);
@@ -155,7 +152,7 @@ class NativeQueryBuilder {
                 this.parts.push(fields.join(', '));
             }
             else {
-                const dataAsArray = core_1.Utils.asArray(this.options.data);
+                const dataAsArray = Utils.asArray(this.options.data);
                 const keys = Object.keys(dataAsArray[0]);
                 const fields = keys.map(field => `${this.quote(field)} = excluded.${this.quote(field)}`);
                 this.parts.push(fields.join(', '));
@@ -183,22 +180,22 @@ class NativeQueryBuilder {
         return this;
     }
     insert(data) {
-        this.type = enums_1.QueryType.INSERT;
+        this.type = QueryType.INSERT;
         this.options.data = data;
         return this;
     }
     update(data) {
-        this.type = enums_1.QueryType.UPDATE;
+        this.type = QueryType.UPDATE;
         this.options.data ??= {};
         Object.assign(this.options.data, data);
         return this;
     }
     delete() {
-        this.type = enums_1.QueryType.DELETE;
+        this.type = QueryType.DELETE;
         return this;
     }
     truncate() {
-        this.type = enums_1.QueryType.TRUNCATE;
+        this.type = QueryType.TRUNCATE;
         return this;
     }
     distinct() {
@@ -224,12 +221,12 @@ class NativeQueryBuilder {
     }
     comment(comment) {
         this.options.comment ??= [];
-        this.options.comment.push(...core_1.Utils.asArray(comment));
+        this.options.comment.push(...Utils.asArray(comment));
         return this;
     }
     hintComment(comment) {
         this.options.hintComment ??= [];
-        this.options.hintComment.push(...core_1.Utils.asArray(comment));
+        this.options.hintComment.push(...Utils.asArray(comment));
         return this;
     }
     setFlags(flags) {
@@ -250,7 +247,7 @@ class NativeQueryBuilder {
     }
     toRaw() {
         const { sql, params } = this.compile();
-        return (0, core_1.raw)(sql, params);
+        return raw(sql, params);
     }
     compileSelect() {
         this.parts.push('select');
@@ -297,7 +294,7 @@ class NativeQueryBuilder {
         else if (this.options.distinctOn) {
             fields = `distinct on (${this.options.distinctOn.map(field => this.quote(field)).join(', ')}) ${fields}`;
         }
-        if (this.type === enums_1.QueryType.COUNT) {
+        if (this.type === QueryType.COUNT) {
             fields = `count(${fields}) as ${this.quote('count')}`;
         }
         return fields;
@@ -324,7 +321,7 @@ class NativeQueryBuilder {
         }
     }
     processInsertData() {
-        const dataAsArray = core_1.Utils.asArray(this.options.data);
+        const dataAsArray = Utils.asArray(this.options.data);
         const keys = Object.keys(dataAsArray[0]);
         const values = keys.map(() => '?');
         const parts = [];
@@ -334,7 +331,7 @@ class NativeQueryBuilder {
         for (const data of dataAsArray) {
             for (const key of keys) {
                 if (typeof data[key] === 'undefined') {
-                    this.params.push(this.platform.usesDefaultKeyword() ? (0, core_1.raw)('default') : null);
+                    this.params.push(this.platform.usesDefaultKeyword() ? raw('default') : null);
                 }
                 else {
                     this.params.push(data[key]);
@@ -396,14 +393,14 @@ class NativeQueryBuilder {
             throw new Error('No table name provided');
         }
         const indexHint = this.options.indexHint ? ' ' + this.options.indexHint : '';
-        if (this.options.tableName instanceof core_1.RawQueryFragment) {
+        if (this.options.tableName instanceof RawQueryFragment) {
             this.params.push(...this.options.tableName.params);
             return this.options.tableName.sql + indexHint;
         }
         return this.options.tableName + indexHint;
     }
     quote(id) {
-        if (id instanceof core_1.RawQueryFragment) {
+        if (id instanceof RawQueryFragment) {
             return this.platform.formatQuery(id.sql, id.params);
         }
         if (id instanceof NativeQueryBuilder) {
@@ -426,4 +423,3 @@ class NativeQueryBuilder {
         return this.platform.quoteIdentifier(id);
     }
 }
-exports.NativeQueryBuilder = NativeQueryBuilder;

package/query/ObjectCriteriaNode.d.ts

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