@mikro-orm/core 6.3.1-dev.0 → 6.3.1-dev.10

package/EntityManager.d.ts

@@ -1,4 +1,4 @@
-import { inspect } from 'util';
+import { inspect } from 'node:util';
 import DataLoader from 'dataloader';
 import { type Configuration, Cursor } from './utils';
 import { type AssignOptions, EntityFactory, type EntityLoaderOptions, type EntityRepository, EntityValidator, Reference } from './entity';

package/EntityManager.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityManager = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const dataloader_1 = __importDefault(require("dataloader"));
 const utils_1 = require("./utils");
 const entity_1 = require("./entity");
@@ -1718,7 +1718,7 @@ class EntityManager {
         return this.getContext(false)._id;
     }
     /** @ignore */
-    [util_1.inspect.custom]() {
+    [node_util_1.inspect.custom]() {
         return `[EntityManager<${this.id}>]`;
     }
 }

package/connections/Connection.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Connection = void 0;
-const url_1 = require("url");
+const node_url_1 = require("node:url");
 const utils_1 = require("../utils");
 class Connection {
     config;
@@ -57,7 +57,7 @@ class Connection {
     getConnectionOptions() {
         const ret = {};
         if (this.options.clientUrl) {
-            const url = new url_1.URL(this.options.clientUrl);
+            const url = new node_url_1.URL(this.options.clientUrl);
             this.options.host = ret.host = this.options.host ?? decodeURIComponent(url.hostname);
             this.options.port = ret.port = this.options.port ?? +url.port;
             this.options.user = ret.user = this.options.user ?? decodeURIComponent(url.username);
@@ -69,7 +69,7 @@ class Connection {
             }
         }
         else {
-            const url = new url_1.URL(this.config.getClientUrl());
+            const url = new node_url_1.URL(this.config.getClientUrl());
             this.options.host = ret.host = this.options.host ?? this.config.get('host', decodeURIComponent(url.hostname));
             this.options.port = ret.port = this.options.port ?? this.config.get('port', +url.port);
             this.options.user = ret.user = this.options.user ?? this.config.get('user', decodeURIComponent(url.username));
@@ -80,7 +80,7 @@ class Connection {
     }
     getClientUrl() {
         const options = this.getConnectionOptions();
-        const url = new url_1.URL(this.config.getClientUrl(true));
+        const url = new node_url_1.URL(this.config.getClientUrl(true));
         const password = options.password ? ':*****' : '';
         const schema = options.schema && options.schema !== this.platform.getDefaultSchemaName()
             ? `?schema=${options.schema}`

package/entity/ArrayCollection.d.ts

@@ -1,4 +1,4 @@
-import { inspect } from 'util';
+import { inspect } from 'node:util';
 import type { EntityDTO, EntityProperty, IPrimaryKey, Primary } from '../typings';
 import { Reference } from './Reference';
 export declare class ArrayCollection<T extends object, O extends object> {

package/entity/ArrayCollection.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArrayCollection = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const Reference_1 = require("./Reference");
 const wrap_1 = require("./wrap");
 const errors_1 = require("../errors");
@@ -384,11 +384,11 @@ class ArrayCollection {
         }
     }
     /** @ignore */
-    [util_1.inspect.custom](depth = 2) {
+    [node_util_1.inspect.custom](depth = 2) {
         const object = { ...this };
         const hidden = ['items', 'owner', '_property', '_count', 'snapshot', '_populated', '_snapshot', '_lazyInitialized', '_em', 'readonly'];
         hidden.forEach(k => delete object[k]);
-        const ret = (0, util_1.inspect)(object, { depth });
+        const ret = (0, node_util_1.inspect)(object, { depth });
         const name = `${this.constructor.name}<${this.property?.type ?? 'unknown'}>`;
         return ret === '[Object]' ? `[${name}]` : name + ' ' + ret;
     }

package/entity/EntityAssigner.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assign = exports.EntityAssigner = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const Collection_1 = require("./Collection");
 const Utils_1 = require("../utils/Utils");
 const Reference_1 = require("./Reference");
@@ -175,7 +175,7 @@ class EntityAssigner {
         });
         if (invalid.length > 0) {
             const name = entity.constructor.name;
-            throw new Error(`Invalid collection values provided for '${name}.${prop.name}' in ${name}.assign(): ${(0, util_1.inspect)(invalid)}`);
+            throw new Error(`Invalid collection values provided for '${name}.${prop.name}' in ${name}.assign(): ${(0, node_util_1.inspect)(invalid)}`);
         }
         if (Array.isArray(value)) {
             collection.set(items);

package/entity/EntityHelper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityHelper = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const typings_1 = require("../typings");
 const EntityTransformer_1 = require("../serialization/EntityTransformer");
 const Reference_1 = require("./Reference");
@@ -115,14 +115,14 @@ class EntityHelper {
     }
     static defineCustomInspect(meta) {
         // @ts-ignore
-        meta.prototype[util_1.inspect.custom] ??= function (depth = 2) {
+        meta.prototype[node_util_1.inspect.custom] ??= function (depth = 2) {
             const object = { ...this };
             // ensure we dont have internal symbols in the POJO
             [typings_1.OptionalProps, typings_1.EntityRepositoryType, typings_1.PrimaryKeyProp, typings_1.EagerProps, typings_1.HiddenProps].forEach(sym => delete object[sym]);
             meta.props
                 .filter(prop => object[prop.name] === undefined)
                 .forEach(prop => delete object[prop.name]);
-            const ret = (0, util_1.inspect)(object, { depth });
+            const ret = (0, node_util_1.inspect)(object, { depth });
             let name = (this).constructor.name;
             const showEM = ['true', 't', '1'].includes(process.env.MIKRO_ORM_LOG_EM_ID?.toString().toLowerCase() ?? '');
             if (showEM) {

package/entity/Reference.d.ts

@@ -1,4 +1,4 @@
-import { inspect } from 'util';
+import { inspect } from 'node:util';
 import type { AddEager, Dictionary, EntityClass, EntityKey, EntityProperty, Loaded, LoadedReference, Primary, Ref } from '../typings';
 import type { FindOneOptions, FindOneOrFailOptions } from '../drivers/IDatabaseDriver';
 export declare class Reference<T extends object> {

package/entity/Reference.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ref = exports.ScalarReference = exports.Reference = void 0;
 exports.ref = ref;
 exports.rel = rel;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const enums_1 = require("../enums");
 const wrap_1 = require("./wrap");
 const utils_1 = require("../utils");
@@ -141,11 +141,11 @@ class Reference {
     }
     /* istanbul ignore next */
     /** @ignore */
-    [util_1.inspect.custom](depth = 2) {
+    [node_util_1.inspect.custom](depth = 2) {
         const object = { ...this };
         const hidden = ['meta'];
         hidden.forEach(k => delete object[k]);
-        const ret = (0, util_1.inspect)(object, { depth });
+        const ret = (0, node_util_1.inspect)(object, { depth });
         const wrapped = (0, wrap_1.helper)(this.entity);
         const meta = wrapped.__meta;
         const pk = wrapped.hasPrimaryKey() ? '<' + wrapped.getSerializedPrimaryKey() + '>' : '';
@@ -195,8 +195,8 @@ class ScalarReference {
     }
     /* istanbul ignore next */
     /** @ignore */
-    [util_1.inspect.custom]() {
-        return this.initialized ? `Ref<${(0, util_1.inspect)(this.value)}>` : `Ref<?>`;
+    [node_util_1.inspect.custom]() {
+        return this.initialized ? `Ref<${(0, node_util_1.inspect)(this.value)}>` : `Ref<?>`;
     }
 }
 exports.ScalarReference = ScalarReference;

package/entity/WrappedEntity.d.ts

@@ -1,5 +1,5 @@
 import type { PopulatePath } from '../enums';
-import { inspect } from 'util';
+import { inspect } from 'node:util';
 import type { EntityManager } from '../EntityManager';
 import type { Dictionary, EntityData, EntityDictionary, EntityMetadata, IHydrator, EntityKey, PopulateOptions, Primary, AutoPath, Ref, AddEager, LoadedReference, EntityDTO, Loaded, FromEntityType, IsSubset, MergeSelected } from '../typings';
 import { Reference } from './Reference';

package/entity/WrappedEntity.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WrappedEntity = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const Reference_1 = require("./Reference");
 const EntityTransformer_1 = require("../serialization/EntityTransformer");
 const EntityAssigner_1 = require("./EntityAssigner");
@@ -139,7 +139,7 @@ class WrappedEntity {
         return Utils_1.Utils.getPrimaryKeyValues(this.entity, this.__meta.primaryKeys);
     }
     /** @ignore */
-    [util_1.inspect.custom]() {
+    [node_util_1.inspect.custom]() {
         return `[WrappedEntity<${this.__meta.className}>]`;
     }
 }

package/errors.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotFoundError = exports.MetadataError = exports.OptimisticLockError = exports.CursorError = exports.ValidationError = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 class ValidationError extends Error {
     entity;
     constructor(message, entity) {
@@ -19,7 +19,7 @@ class ValidationError extends Error {
     }
     static fromWrongPropertyType(entity, property, expectedType, givenType, givenValue) {
         const entityName = entity.constructor.name;
-        const msg = `Trying to set ${entityName}.${property} of type '${expectedType}' to ${(0, util_1.inspect)(givenValue)} of type '${givenType}'`;
+        const msg = `Trying to set ${entityName}.${property} of type '${expectedType}' to ${(0, node_util_1.inspect)(givenValue)} of type '${givenType}'`;
         return new ValidationError(msg);
     }
     static fromWrongRepositoryType(entityName, repoType, method) {
@@ -42,7 +42,7 @@ class ValidationError extends Error {
     }
     static notEntity(owner, prop, data) {
         const type = Object.prototype.toString.call(data).match(/\[object (\w+)]/)[1].toLowerCase();
-        return new ValidationError(`Entity of type ${prop.type} expected for property ${owner.constructor.name}.${prop.name}, ${(0, util_1.inspect)(data)} of type ${type} given. If you are using Object.assign(entity, data), use em.assign(entity, data) instead.`);
+        return new ValidationError(`Entity of type ${prop.type} expected for property ${owner.constructor.name}.${prop.name}, ${(0, node_util_1.inspect)(data)} of type ${type} given. If you are using Object.assign(entity, data), use em.assign(entity, data) instead.`);
     }
     static notDiscoveredEntity(data, meta, action = 'persist') {
         /* istanbul ignore next */
@@ -66,7 +66,7 @@ class ValidationError extends Error {
     }
     static propertyRequired(entity, property) {
         const entityName = entity.__meta.className;
-        return new ValidationError(`Value for ${entityName}.${property.name} is required, '${entity[property.name]}' found\nentity: ${(0, util_1.inspect)(entity)}`, entity);
+        return new ValidationError(`Value for ${entityName}.${property.name} is required, '${entity[property.name]}' found\nentity: ${(0, node_util_1.inspect)(entity)}`, entity);
     }
     static cannotModifyInverseCollection(owner, property) {
         const inverseCollection = `${owner.constructor.name}.${property.name}`;
@@ -96,7 +96,7 @@ class ValidationError extends Error {
         return new ValidationError('Using global EntityManager instance methods for context specific actions is disallowed. If you need to work with the global instance\'s identity map, use `allowGlobalContext` configuration option or `fork()` instead.');
     }
     static cannotUseOperatorsInsideEmbeddables(className, propName, payload) {
-        return new ValidationError(`Using operators inside embeddables is not allowed, move the operator above. (property: ${className}.${propName}, payload: ${(0, util_1.inspect)(payload)})`);
+        return new ValidationError(`Using operators inside embeddables is not allowed, move the operator above. (property: ${className}.${propName}, payload: ${(0, node_util_1.inspect)(payload)})`);
     }
     static invalidEmbeddableQuery(className, propName, embeddableType) {
         return new ValidationError(`Invalid query for entity '${className}', property '${propName}' does not exist in embeddable '${embeddableType}'`);
@@ -213,10 +213,10 @@ class MetadataError extends ValidationError {
 exports.MetadataError = MetadataError;
 class NotFoundError extends ValidationError {
     static findOneFailed(name, where) {
-        return new NotFoundError(`${name} not found (${(0, util_1.inspect)(where)})`);
+        return new NotFoundError(`${name} not found (${(0, node_util_1.inspect)(where)})`);
     }
     static findExactlyOneFailed(name, where) {
-        return new NotFoundError(`Wrong number of ${name} entities found for query ${(0, util_1.inspect)(where)}, expected exactly one`);
+        return new NotFoundError(`Wrong number of ${name} entities found for query ${(0, node_util_1.inspect)(where)}, expected exactly one`);
     }
 }
 exports.NotFoundError = NotFoundError;

package/metadata/MetadataDiscovery.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetadataDiscovery = void 0;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const globby_1 = __importDefault(require("globby"));
 const typings_1 = require("../typings");
 const Utils_1 = require("../utils/Utils");
@@ -183,7 +183,7 @@ class MetadataDiscovery {
         this.logger.log('discovery', `- processing ${colors_1.colors.cyan('' + files.length)} files`);
         const found = [];
         for (const filepath of files) {
-            const filename = (0, path_1.basename)(filepath);
+            const filename = (0, node_path_1.basename)(filepath);
             if (!filename.match(/\.[cm]?[jt]s$/) ||
                 filename.endsWith('.js.map') ||
                 filename.match(/\.d\.[cm]?ts/) ||
@@ -219,9 +219,6 @@ class MetadataDiscovery {
             this.metadata.set(meta.className, meta);
             found.push(schema);
         }
-        for (const schema of found) {
-            this.discoverEntity(schema);
-        }
         // discover parents (base entities) automatically
         for (const meta of this.metadata) {
             let parent = meta.extends;
@@ -236,6 +233,9 @@ class MetadataDiscovery {
                 this.discoverReferences([parent]);
             }
         }
+        for (const schema of found) {
+            this.discoverEntity(schema);
+        }
         return this.discovered.filter(meta => found.find(m => m.name === meta.className));
     }
     prepare(entity) {
@@ -274,7 +274,7 @@ class MetadataDiscovery {
         const meta = schema.meta;
         const root = Utils_1.Utils.getRootEntity(this.metadata, meta);
         schema.meta.path = Utils_1.Utils.relativePath(path || meta.path, this.config.get('baseDir'));
-        const cache = meta.useCache && meta.path && this.cache.get(meta.className + (0, path_1.extname)(meta.path));
+        const cache = meta.useCache && meta.path && this.cache.get(meta.className + (0, node_path_1.extname)(meta.path));
         if (cache) {
             this.logger.log('discovery', `- using cached metadata for entity ${colors_1.colors.cyan(meta.className)}`);
             this.metadataProvider.loadFromCache(meta, cache);
@@ -324,7 +324,7 @@ class MetadataDiscovery {
         ].forEach(key => delete copy[key]);
         // base entity without properties might not have path, but nothing to cache there
         if (meta.path) {
-            this.cache.set(meta.className + (0, path_1.extname)(meta.path), copy, meta.path);
+            this.cache.set(meta.className + (0, node_path_1.extname)(meta.path), copy, meta.path);
         }
     }
     initNullability(prop) {
@@ -458,7 +458,7 @@ class MetadataDiscovery {
             this.initColumnType(prop);
             this.initRelation(prop);
         }
-        meta.simplePK = pks.length === 1 && pks[0].kind === enums_1.ReferenceKind.SCALAR && !pks[0].customType;
+        meta.simplePK = pks.length === 1 && pks[0].kind === enums_1.ReferenceKind.SCALAR && !pks[0].customType && pks[0].runtimeType !== 'Date';
         meta.serializedPrimaryKey = this.platform.getSerializedPrimaryKeyField(meta.primaryKeys[0]);
         const serializedPKProp = meta.properties[meta.serializedPrimaryKey];
         if (serializedPKProp && meta.serializedPrimaryKey !== meta.primaryKeys[0]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.1-dev.0",
+  "version": "6.3.1-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",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.1-dev.0",
+    "mikro-orm": "6.3.1-dev.10",
     "reflect-metadata": "0.2.2"
   }
 }

package/types/EnumArrayType.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnumArrayType = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const ArrayType_1 = require("./ArrayType");
 const errors_1 = require("../errors");
 function mapHydrator(items, hydrate) {
@@ -23,7 +23,7 @@ class EnumArrayType extends ArrayType_1.ArrayType {
         if (Array.isArray(value) && Array.isArray(this.items)) {
             const invalid = value.filter(v => !this.items.includes(v));
             if (invalid.length > 0) {
-                throw new errors_1.ValidationError(`Invalid enum array items provided in ${this.owner}: ${(0, util_1.inspect)(invalid)}`);
+                throw new errors_1.ValidationError(`Invalid enum array items provided in ${this.owner}: ${(0, node_util_1.inspect)(invalid)}`);
             }
         }
         return super.convertToDatabaseValue(value, platform, context);

package/types/Type.d.ts

@@ -1,4 +1,4 @@
-import { inspect } from 'util';
+import { inspect } from 'node:util';
 import type { Platform } from '../platforms';
 import type { Constructor, EntityMetadata, EntityProperty } from '../typings';
 export interface TransformContext {

package/types/Type.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Type = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 class Type {
     static types = new Map();
     platform;
@@ -68,11 +68,11 @@ class Type {
         return !!data?.__mappedType;
     }
     /** @ignore */
-    [util_1.inspect.custom](depth = 2) {
+    [node_util_1.inspect.custom](depth = 2) {
         const object = { ...this };
         const hidden = ['prop', 'platform', 'meta'];
         hidden.forEach(k => delete object[k]);
-        const ret = (0, util_1.inspect)(object, { depth });
+        const ret = (0, node_util_1.inspect)(object, { depth });
         const name = this.constructor.name;
         /* istanbul ignore next */
         return ret === '[Object]' ? `[${name}]` : name + ' ' + ret;

package/unit-of-work/ChangeSet.d.ts

@@ -1,4 +1,4 @@
-import { inspect } from 'util';
+import { inspect } from 'node:util';
 import type { EntityData, EntityMetadata, EntityDictionary, Primary } from '../typings';
 export declare class ChangeSet<T extends object> {
     entity: T;

package/unit-of-work/ChangeSet.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangeSetType = exports.ChangeSet = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const wrap_1 = require("../entity/wrap");
 const Utils_1 = require("../utils/Utils");
 class ChangeSet {
@@ -41,11 +41,11 @@ class ChangeSet {
         return this.serializedPrimaryKey;
     }
     /** @ignore */
-    [util_1.inspect.custom](depth = 2) {
+    [node_util_1.inspect.custom](depth = 2) {
         const object = { ...this };
         const hidden = ['meta', 'serializedPrimaryKey'];
         hidden.forEach(k => delete object[k]);
-        const ret = (0, util_1.inspect)(object, { depth });
+        const ret = (0, node_util_1.inspect)(object, { depth });
         const name = `${this.constructor.name}<${this.meta.className}>`;
         /* istanbul ignore next */
         return ret === '[Object]' ? `[${name}]` : name + ' ' + ret;

package/unit-of-work/UnitOfWork.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnitOfWork = void 0;
-const async_hooks_1 = require("async_hooks");
+const node_async_hooks_1 = require("node:async_hooks");
 const entity_1 = require("../entity");
 const ChangeSet_1 = require("./ChangeSet");
 const ChangeSetComputer_1 = require("./ChangeSetComputer");
@@ -13,7 +13,7 @@ const errors_1 = require("../errors");
 const events_1 = require("../events");
 const IdentityMap_1 = require("./IdentityMap");
 // to deal with validation for flush inside flush hooks and `Promise.all`
-const insideFlush = new async_hooks_1.AsyncLocalStorage();
+const insideFlush = new node_async_hooks_1.AsyncLocalStorage();
 class UnitOfWork {
     em;
     /** map of references to managed entities */

package/utils/ConfigurationLoader.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigurationLoader = void 0;
 const dotenv_1 = __importDefault(require("dotenv"));
 const fs_extra_1 = require("fs-extra");
-const os_1 = require("os");
-const path_1 = require("path");
-const url_1 = require("url");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+const node_url_1 = require("node:url");
 const colors_1 = require("../logging/colors");
 const Configuration_1 = require("./Configuration");
 const Utils_1 = require("./Utils");
@@ -104,7 +104,7 @@ class ConfigurationLoader {
         return type === 'module';
     }
     static registerTsNode(configPath = 'tsconfig.json') {
-        const tsConfigPath = (0, path_1.isAbsolute)(configPath) ? configPath : (0, path_1.join)(process.cwd(), configPath);
+        const tsConfigPath = (0, node_path_1.isAbsolute)(configPath) ? configPath : (0, node_path_1.join)(process.cwd(), configPath);
         const tsNode = Utils_1.Utils.tryRequire({
             module: 'ts-node',
             from: tsConfigPath,
@@ -240,9 +240,9 @@ class ConfigurationLoader {
         }
         /* istanbul ignore next */
         options.dynamicImportProvider ??= id => {
-            if ((0, os_1.platform)() === 'win32') {
+            if ((0, node_os_1.platform)() === 'win32') {
                 try {
-                    id = (0, url_1.fileURLToPath)(id);
+                    id = (0, node_url_1.fileURLToPath)(id);
                 }
                 catch {
                     // ignore

package/utils/Cursor.d.ts

@@ -1,4 +1,4 @@
-import { inspect } from 'util';
+import { inspect } from 'node:util';
 import type { EntityMetadata, FilterObject, Loaded } from '../typings';
 import type { FindByCursorOptions, OrderDefinition } from '../drivers/IDatabaseDriver';
 import { type QueryOrder } from '../enums';

package/utils/Cursor.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cursor = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const Utils_1 = require("./Utils");
 const enums_1 = require("../enums");
 const Reference_1 = require("../entity/Reference");
@@ -164,10 +164,10 @@ class Cursor {
     }
     /* istanbul ignore next */
     /** @ignore */
-    [util_1.inspect.custom]() {
+    [node_util_1.inspect.custom]() {
         const type = this.items[0]?.constructor.name;
         const { items, startCursor, endCursor, hasPrevPage, hasNextPage, totalCount, length } = this;
-        const options = (0, util_1.inspect)({ startCursor, endCursor, totalCount, hasPrevPage, hasNextPage, items, length }, { depth: 0 });
+        const options = (0, node_util_1.inspect)({ startCursor, endCursor, totalCount, hasPrevPage, hasNextPage, items, length }, { depth: 0 });
         return `Cursor${type ? `<${type}>` : ''} ${options.replace('items: [Array]', 'items: [...]')}`;
     }
 }

package/utils/RawQueryFragment.d.ts

@@ -1,4 +1,4 @@
-import { inspect } from 'util';
+import { inspect } from 'node:util';
 import type { AnyString, Dictionary, EntityKey } from '../typings';
 export declare class RawQueryFragment {
     #private;

package/utils/RawQueryFragment.js

@@ -4,7 +4,7 @@ exports.ALIAS_REPLACEMENT_RE = exports.ALIAS_REPLACEMENT = exports.RawQueryFragm
 exports.raw = raw;
 exports.sql = sql;
 exports.createSqlFunction = createSqlFunction;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const Utils_1 = require("./Utils");
 class RawQueryFragment {
     sql;
@@ -79,7 +79,7 @@ class RawQueryFragment {
     }
     /* istanbul ignore next */
     /** @ignore */
-    [util_1.inspect.custom]() {
+    [node_util_1.inspect.custom]() {
         if (this.params) {
             return { sql: this.sql, params: this.params };
         }

package/utils/RequestContext.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestContext = void 0;
-const async_hooks_1 = require("async_hooks");
+const node_async_hooks_1 = require("node:async_hooks");
 /**
  * Uses `AsyncLocalStorage` to create async context that holds the current EM fork.
  */
 class RequestContext {
     map;
-    static storage = new async_hooks_1.AsyncLocalStorage();
+    static storage = new node_async_hooks_1.AsyncLocalStorage();
     static counter = 1;
     id = RequestContext.counter++;
     constructor(map) {

package/utils/TransactionContext.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionContext = void 0;
-const async_hooks_1 = require("async_hooks");
+const node_async_hooks_1 = require("node:async_hooks");
 class TransactionContext {
     em;
-    static storage = new async_hooks_1.AsyncLocalStorage();
+    static storage = new node_async_hooks_1.AsyncLocalStorage();
     id;
     constructor(em) {
         this.em = em;

package/utils/Utils.d.ts

@@ -1,5 +1,5 @@
 import { type GlobbyOptions } from 'globby';
-import { type URL } from 'url';
+import { type URL } from 'node:url';
 import type { Dictionary, EntityData, EntityDictionary, EntityKey, EntityMetadata, EntityName, EntityProperty, IMetadataStorage, Primary } from '../typings';
 import type { Collection } from '../entity/Collection';
 import type { Platform } from '../platforms';
@@ -133,7 +133,7 @@ export declare class Utils {
     static extractPK<T extends object>(data: any, meta?: EntityMetadata<T>, strict?: boolean): Primary<T> | string | null;
     static getCompositeKeyValue<T>(data: EntityData<T>, meta: EntityMetadata<T>, convertCustomTypes?: boolean | 'convertToDatabaseValue' | 'convertToJSValue', platform?: Platform): Primary<T>;
     static getCompositeKeyHash<T>(data: EntityData<T>, meta: EntityMetadata<T>, convertCustomTypes?: boolean, platform?: Platform, flat?: boolean): string;
-    static getPrimaryKeyHash(pks: (string | Buffer)[]): string;
+    static getPrimaryKeyHash(pks: (string | Buffer | Date)[]): string;
     static splitPrimaryKeys<T extends object>(key: string): EntityKey<T>[];
     static getPrimaryKeyValues<T>(entity: T, primaryKeys: string[], allowScalar?: boolean, convertCustomTypes?: boolean): any;
     static getPrimaryKeyCond<T>(entity: T, primaryKeys: EntityKey<T>[]): Record<string, Primary<T>> | null;

package/utils/Utils.js

@@ -10,13 +10,13 @@ exports.compareBooleans = compareBooleans;
 exports.compareBuffers = compareBuffers;
 exports.equals = equals;
 exports.parseJsonSafe = parseJsonSafe;
-const module_1 = require("module");
+const node_module_1 = require("node:module");
 const globby_1 = __importDefault(require("globby"));
-const path_1 = require("path");
-const os_1 = require("os");
-const url_1 = require("url");
+const node_path_1 = require("node:path");
+const node_os_1 = require("node:os");
+const node_url_1 = require("node:url");
 const fs_extra_1 = require("fs-extra");
-const crypto_1 = require("crypto");
+const node_crypto_1 = require("node:crypto");
 const esprima_1 = require("esprima");
 const clone_1 = require("./clone");
 const enums_1 = require("../enums");
@@ -476,7 +476,15 @@ class Utils {
         return Utils.getPrimaryKeyHash(pks);
     }
     static getPrimaryKeyHash(pks) {
-        return pks.map(pk => Buffer.isBuffer(pk) ? pk.toString('hex') : pk).join(this.PK_SEPARATOR);
+        return pks.map(pk => {
+            if (Buffer.isBuffer(pk)) {
+                return pk.toString('hex');
+            }
+            if (pk instanceof Date) {
+                return pk.toISOString();
+            }
+            return pk;
+        }).join(this.PK_SEPARATOR);
     }
     static splitPrimaryKeys(key) {
         return key.split(this.PK_SEPARATOR);
@@ -704,7 +712,7 @@ class Utils {
     }
     static fileURLToPath(url) {
         // expose `fileURLToPath` on Utils so that it can be properly mocked in tests
-        return (0, url_1.fileURLToPath)(url);
+        return (0, node_url_1.fileURLToPath)(url);
     }
     /**
      * Resolves and normalizes a series of path parts relative to each preceding part.
@@ -717,7 +725,7 @@ class Utils {
         let start = 0;
         for (let i = 0; i < parts.length; i++) {
             const part = parts[i];
-            if ((0, path_1.isAbsolute)(part)) {
+            if ((0, node_path_1.isAbsolute)(part)) {
                 start = i;
             }
             else if (part.startsWith('file:')) {
@@ -729,7 +737,7 @@ class Utils {
             parts = parts.slice(start);
         }
         let path = parts.join('/').replace(/\\/g, '/').replace(/\/$/, '');
-        path = (0, path_1.normalize)(path).replace(/\\/g, '/');
+        path = (0, node_path_1.normalize)(path).replace(/\\/g, '/');
         return (path.match(/^[/.]|[a-zA-Z]:/) || path.startsWith('!')) ? path : './' + path;
     }
     /**
@@ -744,7 +752,7 @@ class Utils {
         if (path.startsWith('.')) {
             return path;
         }
-        path = (0, path_1.relative)(Utils.normalizePath(relativeTo), path);
+        path = (0, node_path_1.relative)(Utils.normalizePath(relativeTo), path);
         return Utils.normalizePath(path);
     }
     /**
@@ -755,13 +763,13 @@ class Utils {
         if (!path) {
             return Utils.normalizePath(baseDir);
         }
-        if (!(0, path_1.isAbsolute)(path) && !path.startsWith('file://')) {
+        if (!(0, node_path_1.isAbsolute)(path) && !path.startsWith('file://')) {
             path = baseDir + '/' + path;
         }
         return Utils.normalizePath(path);
     }
     static hash(data, length) {
-        const hash = (0, crypto_1.createHash)('md5').update(data).digest('hex');
+        const hash = (0, node_crypto_1.createHash)('md5').update(data).digest('hex');
         if (length) {
             return hash.substring(0, length);
         }
@@ -857,16 +865,16 @@ class Utils {
      * @param [from] Location to start the node resolution
      */
     static requireFrom(id, from = process.cwd()) {
-        if (!(0, path_1.extname)(from)) {
-            from = (0, path_1.join)(from, '__fake.js');
+        if (!(0, node_path_1.extname)(from)) {
+            from = (0, node_path_1.join)(from, '__fake.js');
         }
-        return (0, module_1.createRequire)((0, path_1.resolve)(from))(id);
+        return (0, node_module_1.createRequire)((0, node_path_1.resolve)(from))(id);
     }
     static async dynamicImport(id) {
         /* istanbul ignore next */
-        if ((0, os_1.platform)() === 'win32') {
+        if ((0, node_os_1.platform)() === 'win32') {
             try {
-                id = (0, url_1.pathToFileURL)(id).toString();
+                id = (0, node_url_1.pathToFileURL)(id).toString();
             }
             catch {
                 // ignore

package/utils/clone.js

@@ -6,7 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clone = clone;
-const events_1 = require("events");
+const node_events_1 = require("node:events");
 const RawQueryFragment_1 = require("./RawQueryFragment");
 function clone(parent, respectCustomCloneMethod = true) {
     const allParents = [];
@@ -20,7 +20,7 @@ function clone(parent, respectCustomCloneMethod = true) {
         if (raw && respectCustomCloneMethod) {
             return raw.clone();
         }
-        if (typeof parent !== 'object' || parent instanceof events_1.EventEmitter) {
+        if (typeof parent !== 'object' || parent instanceof node_events_1.EventEmitter) {
             return parent;
         }
         if (respectCustomCloneMethod && 'clone' in parent && typeof parent.clone === 'function') {