@mikro-orm/cli 7.2.0-dev.9 → 7.2.1-dev.0

package/CLIHelper.d.ts

@@ -37,18 +37,19 @@ export declare class CLIHelper {
         empty: string;
     }): void;
     /**
-     * Tries to register TS support in the following order: oxc, swc, tsx, jiti, tsimp
+     * Tries to register TS support in the following order: oxc, swc, tsx, jiti, tsimp, nub
      * Use `MIKRO_ORM_CLI_TS_LOADER` env var to set the loader explicitly.
+     * `nub` is skipped when a custom tsconfig path is used, and it supports only the legacy decorators.
      * This method is used only in CLI context.
      */
-    static registerTypeScriptSupport(configPath?: string, tsLoader?: 'oxc' | 'swc' | 'tsx' | 'jiti' | 'tsimp' | 'auto'): Promise<boolean>;
+    static registerTypeScriptSupport(configPath?: string, tsLoader?: 'oxc' | 'swc' | 'tsx' | 'jiti' | 'tsimp' | 'nub' | 'auto'): Promise<boolean>;
     static isESM(): boolean;
     static showHelp(): void;
 }
 export interface Settings {
     verbose?: boolean;
     preferTs?: boolean;
-    tsLoader?: 'oxc' | 'swc' | 'tsx' | 'jiti' | 'tsimp' | 'auto';
+    tsLoader?: 'oxc' | 'swc' | 'tsx' | 'jiti' | 'tsimp' | 'nub' | 'auto';
     tsConfigPath?: string;
     configPaths?: string[];
 }

package/CLIHelper.js

@@ -185,6 +185,9 @@ export class CLIHelper {
             case 'libsql':
                 ret.driver ??= await import('@mikro-orm/libsql').then(m => m.LibSqlDriver);
                 break;
+            case 'sql-js':
+                ret.driver ??= await import('@mikro-orm/sql-js').then(m => m.SqlJsDriver);
+                break;
             case 'oracledb':
                 ret.driver ??= await import('@mikro-orm/oracledb').then(m => m.OracleDriver);
                 break;
@@ -265,8 +268,9 @@ export class CLIHelper {
         CLIHelper.dump(ret);
     }
     /**
-     * Tries to register TS support in the following order: oxc, swc, tsx, jiti, tsimp
+     * Tries to register TS support in the following order: oxc, swc, tsx, jiti, tsimp, nub
      * Use `MIKRO_ORM_CLI_TS_LOADER` env var to set the loader explicitly.
+     * `nub` is skipped when a custom tsconfig path is used, and it supports only the legacy decorators.
      * This method is used only in CLI context.
      */
     static async registerTypeScriptSupport(configPath = 'tsconfig.json', tsLoader) {
@@ -278,32 +282,62 @@ export class CLIHelper {
         process.env.TSIMP_PROJECT ??= configPath;
         process.env.MIKRO_ORM_CLI_ALWAYS_ALLOW_TS ??= '1';
         const explicitLoader = tsLoader ?? process.env.MIKRO_ORM_CLI_TS_LOADER ?? 'auto';
+        const usesDefaultTsConfig = fs.absolutePath(configPath) === fs.absolutePath('tsconfig.json');
         const setEsmImportProvider = () => {
             return (globalThis.dynamicImportProvider = (id) => import(id).then(mod => mod?.default ?? mod));
         };
+        if (explicitLoader === 'nub' && !usesDefaultTsConfig) {
+            throw new Error('The `nub` loader does not support a custom tsconfig path. Use the project tsconfig.json or select another loader.');
+        }
         const loaders = {
             oxc: { esm: '@oxc-node/core/register', cjs: '@oxc-node/core/register' },
             swc: { esm: '@swc-node/register/esm-register', cjs: '@swc-node/register' },
             tsx: { esm: 'tsx/esm/api', cjs: 'tsx/cjs/api', cb: (tsx) => tsx.register({ tsconfig: configPath }) },
             jiti: { cjs: 'jiti/register', cb: setEsmImportProvider },
             tsimp: { cjs: 'tsimp/import', cb: setEsmImportProvider },
+            nub: { esm: '@nubjs/loader', cjs: '@nubjs/loader' },
         };
+        const errors = [];
         for (const loader of Utils.keys(loaders)) {
+            if (loader === 'nub' && !usesDefaultTsConfig) {
+                continue;
+            }
             if (explicitLoader !== 'auto' && loader !== explicitLoader) {
                 continue;
             }
             const { esm, cjs, cb } = loaders[loader];
             const isEsm = this.isESM();
             const module = isEsm && esm ? esm : cjs;
-            const mod = await Utils.tryImport({ module });
+            let mod;
+            try {
+                mod = await Utils.tryImport({ module });
+            }
+            catch (e) {
+                const error = new Error(`Failed to load TypeScript loader \`${loader}\` (${module}): ${e.message}`, {
+                    cause: e,
+                });
+                if (explicitLoader !== 'auto') {
+                    throw error;
+                }
+                errors.push(error);
+                continue;
+            }
             if (mod) {
                 cb?.(mod);
                 process.env.MIKRO_ORM_CLI_TS_LOADER = loader;
                 return true;
             }
         }
+        // a loader that is installed but broken is a real problem, not a missing dependency
+        if (errors.length > 0) {
+            throw new Error(errors.map(e => e.message).join('\n'), { cause: errors[0] });
+        }
+        const loadersMessage = usesDefaultTsConfig
+            ? '`oxc`, `swc`, `tsx`, `jiti`, `tsimp` nor `nub`'
+            : '`oxc`, `swc`, `tsx`, `jiti` nor `tsimp`';
+        const nubHint = usesDefaultTsConfig ? '' : ' The `nub` loader was skipped as a custom tsconfig path is configured.';
         // eslint-disable-next-line no-console
-        console.warn('Neither `oxc`, `swc`, `tsx`, `jiti` nor `tsimp` found in the project dependencies, support for working with TypeScript files might not work. To use `oxc`, install `@oxc-node/core`. To use `swc`, install both `@swc-node/register` and `@swc/core`.');
+        console.warn(`Neither ${loadersMessage} found in the project dependencies, support for working with TypeScript files might not work.${nubHint} To use \`oxc\`, install \`@oxc-node/core\`. To use \`swc\`, install both \`@swc-node/register\` and \`@swc/core\`.`);
         return false;
     }
     static isESM() {

package/README.md

@@ -24,6 +24,7 @@ npm install @mikro-orm/mysql        # MySQL
 npm install @mikro-orm/mariadb      # MariaDB
 npm install @mikro-orm/sqlite       # SQLite
 npm install @mikro-orm/libsql       # libSQL / Turso
+npm install @mikro-orm/sql-js       # sql.js (in-memory SQLite in WASM)
 npm install @mikro-orm/mongodb      # MongoDB
 npm install @mikro-orm/mssql        # MS SQL Server
 npm install @mikro-orm/oracledb     # Oracle

package/commands/DiscoveryExportCommand.js

@@ -10,6 +10,7 @@ const driverPackageMap = {
     MariaDbDriver: '@mikro-orm/mariadb',
     SqliteDriver: '@mikro-orm/sqlite',
     LibSqlDriver: '@mikro-orm/libsql',
+    SqlJsDriver: '@mikro-orm/sql-js',
     MsSqlDriver: '@mikro-orm/mssql',
     OracleDriver: '@mikro-orm/oracledb',
     MongoDriver: '@mikro-orm/mongodb',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/cli",
-  "version": "7.2.0-dev.9",
+  "version": "7.2.1-dev.0",
   "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.",
   "keywords": [
     "data-mapper",
@@ -50,8 +50,8 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/core": "7.2.0-dev.9",
-    "mikro-orm": "7.2.0-dev.9",
+    "@mikro-orm/core": "7.2.1-dev.0",
+    "mikro-orm": "7.2.1-dev.0",
     "yargs": "17.7.2"
   },
   "engines": {