@mikro-orm/core 7.0.0-dev.59 → 7.0.0-dev.60

package/cache/FileCacheAdapter.js

@@ -1,4 +1,3 @@
-import { globSync } from 'tinyglobby';
 import { existsSync, readFileSync, writeFileSync, unlinkSync } from 'node:fs';
 import { Utils } from '../utils/Utils.js';
 export class FileCacheAdapter {
@@ -53,7 +52,7 @@ export class FileCacheAdapter {
      */
     clear() {
         const path = this.path('*');
-        const files = globSync(path);
+        const files = Utils.glob(path);
         files.forEach(file => unlinkSync(file));
         this.cache = {};
     }

package/metadata/discover-entities.js

@@ -1,5 +1,4 @@
 import { basename } from 'node:path';
-import { glob } from 'tinyglobby';
 import { Utils } from '../utils/Utils.js';
 import { MetadataStorage } from './MetadataStorage.js';
 import { EntitySchema } from './EntitySchema.js';
@@ -27,7 +26,7 @@ async function getEntityClassOrSchema(filepath, allTargets, baseDir) {
 export async function discoverEntities(paths, options) {
     paths = Utils.asArray(paths).map(path => Utils.normalizePath(path));
     const baseDir = options?.baseDir ?? process.cwd();
-    const files = await glob(paths, { cwd: Utils.normalizePath(baseDir) });
+    const files = Utils.glob(paths, Utils.normalizePath(baseDir));
     const found = new Map();
     for (const filepath of files) {
         const filename = basename(filepath);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.59",
+  "version": "7.0.0-dev.60",
   "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.",
   "exports": {
     "./package.json": "./package.json",
@@ -40,7 +40,7 @@
   },
   "homepage": "https://mikro-orm.io",
   "engines": {
-    "node": ">= 22.11.0"
+    "node": ">= 22.17.0"
   },
   "scripts": {
     "build": "yarn clean && yarn compile && yarn copy",
@@ -54,9 +54,8 @@
   "dependencies": {
     "dotenv": "17.2.3",
     "esprima": "4.0.1",
-    "mikro-orm": "7.0.0-dev.59",
-    "reflect-metadata": "0.2.2",
-    "tinyglobby": "0.2.13"
+    "mikro-orm": "7.0.0-dev.60",
+    "reflect-metadata": "0.2.2"
   },
   "peerDependencies": {
     "dataloader": "2.2.3"

package/utils/Configuration.js

@@ -351,13 +351,13 @@ export class Configuration {
      * break existing projects, only help with the new ones.
      */
     detectSourceFolder(options) {
-        if (!Utils.pathExistsSync(this.options.baseDir + '/src')) {
+        if (!Utils.pathExists(this.options.baseDir + '/src')) {
             return;
         }
-        const migrationsPathExists = Utils.pathExistsSync(this.options.baseDir + '/' + this.options.migrations.path);
-        const seedersPathExists = Utils.pathExistsSync(this.options.baseDir + '/' + this.options.seeder.path);
-        const distDir = Utils.pathExistsSync(this.options.baseDir + '/dist');
-        const buildDir = Utils.pathExistsSync(this.options.baseDir + '/build');
+        const migrationsPathExists = Utils.pathExists(this.options.baseDir + '/' + this.options.migrations.path);
+        const seedersPathExists = Utils.pathExists(this.options.baseDir + '/' + this.options.seeder.path);
+        const distDir = Utils.pathExists(this.options.baseDir + '/dist');
+        const buildDir = Utils.pathExists(this.options.baseDir + '/build');
         // if neither `dist` nor `build` exist, we use the `src` folder as it might be a JS project without building, but with `src` folder
         const path = distDir ? './dist' : (buildDir ? './build' : './src');
         // only if the user did not provide any values and if the default path does not exist

package/utils/ConfigurationLoader.js

@@ -80,7 +80,7 @@ export class ConfigurationLoader {
         for (let path of paths) {
             path = Utils.absolutePath(path);
             path = Utils.normalizePath(path);
-            if (Utils.pathExistsSync(path)) {
+            if (Utils.pathExists(path)) {
                 const config = await Utils.dynamicImport(path);
                 /* v8 ignore next */
                 return [path, await (config.default ?? config)];
@@ -89,7 +89,7 @@ export class ConfigurationLoader {
         return [];
     }
     static getPackageConfig(basePath = process.cwd()) {
-        if (Utils.pathExistsSync(`${basePath}/package.json`)) {
+        if (Utils.pathExists(`${basePath}/package.json`)) {
             /* v8 ignore next 5 */
             try {
                 return Utils.readJSONSync(`${basePath}/package.json`);
@@ -130,8 +130,8 @@ export class ConfigurationLoader {
             paths.push('./src/mikro-orm.config.ts');
             paths.push('./mikro-orm.config.ts');
         }
-        const distDir = Utils.pathExistsSync(process.cwd() + '/dist');
-        const buildDir = Utils.pathExistsSync(process.cwd() + '/build');
+        const distDir = Utils.pathExists(process.cwd() + '/dist');
+        const buildDir = Utils.pathExists(process.cwd() + '/build');
         /* v8 ignore next */
         const path = distDir ? 'dist' : (buildDir ? 'build' : 'src');
         paths.push(`./${path}/mikro-orm.config.js`);

package/utils/Utils.d.ts

@@ -1,4 +1,3 @@
-import { type GlobOptions } from 'tinyglobby';
 import type { Dictionary, EntityData, EntityDictionary, EntityKey, EntityMetadata, EntityName, EntityProperty, IMetadataStorage, Primary } from '../typings.js';
 import type { Collection } from '../entity/Collection.js';
 import type { Platform } from '../platforms/Platform.js';
@@ -212,7 +211,8 @@ export declare class Utils {
     static findDuplicates<T>(items: T[]): T[];
     static removeDuplicates<T>(items: T[]): T[];
     static randomInt(min: number, max: number): number;
-    static pathExists(path: string, options?: GlobOptions): Promise<boolean>;
+    static glob(input: string | string[], cwd?: string): string[];
+    static pathExists(path: string): boolean;
     /**
      * Extracts all possible values of a TS enum. Works with both string and numeric enums.
      */
@@ -239,7 +239,6 @@ export declare class Utils {
     static dynamicImport<T = any>(id: string): Promise<T>;
     static setDynamicImportProvider(provider: (id: string) => Promise<unknown>): void;
     static ensureDir(path: string): void;
-    static pathExistsSync(path: string): boolean;
     static readJSONSync(path: string): Dictionary;
     static getORMVersion(): string;
     static createFunction(context: Map<string, any>, code: string): any;

package/utils/Utils.js

@@ -1,8 +1,7 @@
 import { createRequire } from 'node:module';
-import { glob, isDynamicPattern } from 'tinyglobby';
 import { extname, isAbsolute, join, normalize, relative, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { existsSync, mkdirSync, readFileSync } from 'node:fs';
+import { existsSync, globSync, statSync, mkdirSync, readFileSync } from 'node:fs';
 import { createHash } from 'node:crypto';
 import { tokenize } from 'esprima';
 import { clone } from './clone.js';
@@ -819,12 +818,32 @@ export class Utils {
     static randomInt(min, max) {
         return Math.round(Math.random() * (max - min)) + min;
     }
-    static async pathExists(path, options = {}) {
-        if (isDynamicPattern(path)) {
-            const found = await glob(path, options);
+    static glob(input, cwd) {
+        if (Array.isArray(input)) {
+            return input.flatMap(paths => this.glob(paths, cwd));
+        }
+        const hasGlobChars = /[*?[\]]/.test(input);
+        if (!hasGlobChars) {
+            try {
+                const s = statSync(cwd ? Utils.normalizePath(cwd, input) : input);
+                if (s.isDirectory()) {
+                    const files = globSync(join(input, '**'), { cwd, withFileTypes: true });
+                    return files.filter(f => f.isFile()).map(f => join(f.parentPath, f.name));
+                }
+            }
+            catch {
+                // ignore
+            }
+        }
+        const files = globSync(input, { cwd, withFileTypes: true });
+        return files.filter(f => f.isFile()).map(f => join(f.parentPath, f.name));
+    }
+    static pathExists(path) {
+        if (/[*?[\]]/.test(path)) {
+            const found = globSync(path);
             return found.length > 0;
         }
-        return this.pathExistsSync(path);
+        return existsSync(path);
     }
     /**
      * Extracts all possible values of a TS enum. Works with both string and numeric enums.
@@ -917,9 +936,6 @@ export class Utils {
             mkdirSync(path, { recursive: true });
         }
     }
-    static pathExistsSync(path) {
-        return existsSync(path);
-    }
     static readJSONSync(path) {
         const file = readFileSync(path);
         return JSON.parse(file.toString());