@mikro-orm/cli 7.0.0-dev.1 → 7.0.0-dev.100

package/commands/MigrationCommandFactory.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrationCommandFactory = void 0;
-const core_1 = require("@mikro-orm/core");
-const CLIHelper_1 = require("../CLIHelper");
-class MigrationCommandFactory {
+import { colors, Utils, } from '@mikro-orm/core';
+import { CLIHelper } from '../CLIHelper.js';
+export class MigrationCommandFactory {
     static DESCRIPTIONS = {
         create: 'Create new migration with current schema diff',
         up: 'Migrate up to the latest version',
@@ -82,27 +79,26 @@ class MigrationCommandFactory {
     static async handleMigrationCommand(args, method) {
         // to be able to run have a master transaction, but run marked migrations outside of it, we need a second connection
         const options = { pool: { min: 1, max: 2 } };
-        const orm = await CLIHelper_1.CLIHelper.getORM(args.contextName, args.config, options);
-        const migrator = orm.getMigrator();
+        const orm = await CLIHelper.getORM(args.contextName, args.config, options);
         switch (method) {
             case 'create':
-                await this.handleCreateCommand(migrator, args, orm.config);
+                await this.handleCreateCommand(orm.migrator, args, orm.config);
                 break;
             case 'check':
-                await this.handleCheckCommand(migrator, orm);
+                await this.handleCheckCommand(orm.migrator, orm);
                 break;
             case 'list':
-                await this.handleListCommand(migrator);
+                await this.handleListCommand(orm.migrator);
                 break;
             case 'pending':
-                await this.handlePendingCommand(migrator);
+                await this.handlePendingCommand(orm.migrator);
                 break;
             case 'up':
             case 'down':
-                await this.handleUpDownCommand(args, migrator, method);
+                await this.handleUpDownCommand(args, orm.migrator, method);
                 break;
             case 'fresh':
-                await this.handleFreshCommand(args, migrator, orm);
+                await this.handleFreshCommand(args, orm.migrator, orm);
         }
         await orm.close(true);
     }
@@ -121,22 +117,22 @@ class MigrationCommandFactory {
         const opts = MigrationCommandFactory.getUpDownOptions(args);
         await migrator[method](opts);
         const message = this.getUpDownSuccessMessage(method, opts);
-        CLIHelper_1.CLIHelper.dump(core_1.colors.green(message));
+        CLIHelper.dump(colors.green(message));
     }
     static async handlePendingCommand(migrator) {
-        const pending = await migrator.getPendingMigrations();
-        CLIHelper_1.CLIHelper.dumpTable({
+        const pending = await migrator.getPending();
+        CLIHelper.dumpTable({
             columns: ['Name'],
             rows: pending.map(row => [row.name]),
             empty: 'No pending migrations',
         });
     }
     static async handleListCommand(migrator) {
-        const executed = await migrator.getExecutedMigrations();
-        CLIHelper_1.CLIHelper.dumpTable({
+        const executed = await migrator.getExecuted();
+        CLIHelper.dumpTable({
             columns: ['Name', 'Executed at'],
             rows: executed.map(row => {
-                /* istanbul ignore next */
+                /* v8 ignore next */
                 const executedAt = (row.executed_at ?? row.created_at)?.toISOString() ?? '';
                 return [row.name.replace(/\.[jt]s$/, ''), executedAt];
             }),
@@ -144,46 +140,44 @@ class MigrationCommandFactory {
         });
     }
     static async handleCreateCommand(migrator, args, config) {
-        const ret = await migrator.createMigration(args.path, args.blank, args.initial, args.name);
+        const ret = await migrator.create(args.path, args.blank, args.initial, args.name);
         if (ret.diff.up.length === 0) {
-            return CLIHelper_1.CLIHelper.dump(core_1.colors.green(`No changes required, schema is up-to-date`));
+            return CLIHelper.dump(colors.green(`No changes required, schema is up-to-date`));
         }
         if (args.dump) {
-            CLIHelper_1.CLIHelper.dump(core_1.colors.green('Creating migration with following queries:'));
-            CLIHelper_1.CLIHelper.dump(core_1.colors.green('up:'));
-            CLIHelper_1.CLIHelper.dump(ret.diff.up.map(sql => '  ' + sql).join('\n'), config);
-            /* istanbul ignore next */
+            CLIHelper.dump(colors.green('Creating migration with following queries:'));
+            CLIHelper.dump(colors.green('up:'));
+            CLIHelper.dump(ret.diff.up.map(sql => '  ' + sql).join('\n'), config);
+            /* v8 ignore if */
             if (config.getDriver().getPlatform().supportsDownMigrations()) {
-                CLIHelper_1.CLIHelper.dump(core_1.colors.green('down:'));
-                CLIHelper_1.CLIHelper.dump(ret.diff.down.map(sql => '  ' + sql).join('\n'), config);
+                CLIHelper.dump(colors.green('down:'));
+                CLIHelper.dump(ret.diff.down.map(sql => '  ' + sql).join('\n'), config);
             }
             else {
-                CLIHelper_1.CLIHelper.dump(core_1.colors.yellow(`(${config.getDriver().constructor.name} does not support automatic down migrations)`));
+                CLIHelper.dump(colors.yellow(`(${config.getDriver().constructor.name} does not support automatic down migrations)`));
             }
         }
-        CLIHelper_1.CLIHelper.dump(core_1.colors.green(`${ret.fileName} successfully created`));
+        CLIHelper.dump(colors.green(`${ret.fileName} successfully created`));
     }
     static async handleCheckCommand(migrator, orm) {
-        if (!await migrator.checkMigrationNeeded()) {
-            return CLIHelper_1.CLIHelper.dump(core_1.colors.green(`No changes required, schema is up-to-date`));
+        if (!(await migrator.checkSchema())) {
+            return CLIHelper.dump(colors.green(`No changes required, schema is up-to-date`));
         }
         await orm.close(true);
-        CLIHelper_1.CLIHelper.dump(core_1.colors.yellow(`Changes detected. Please create migration to update schema.`));
+        CLIHelper.dump(colors.yellow(`Changes detected. Please create migration to update schema.`));
         process.exit(1);
     }
     static async handleFreshCommand(args, migrator, orm) {
-        const generator = orm.getSchemaGenerator();
-        await generator.dropSchema({ dropMigrationsTable: true, dropDb: args.dropDb });
-        CLIHelper_1.CLIHelper.dump(core_1.colors.green('Dropped schema successfully'));
+        await orm.schema.drop({ dropMigrationsTable: true, dropDb: args.dropDb });
+        CLIHelper.dump(colors.green('Dropped schema successfully'));
         const opts = MigrationCommandFactory.getUpDownOptions(args);
         await migrator.up(opts);
         const message = this.getUpDownSuccessMessage('up', opts);
-        CLIHelper_1.CLIHelper.dump(core_1.colors.green(message));
+        CLIHelper.dump(colors.green(message));
         if (args.seed !== undefined) {
-            const seeder = orm.getSeeder();
             const seederClass = args.seed || orm.config.get('seeder').defaultSeeder;
-            await seeder.seedString(seederClass);
-            CLIHelper_1.CLIHelper.dump(core_1.colors.green(`Database seeded successfully with seeder class ${seederClass}`));
+            await orm.seeder.seedString(seederClass);
+            CLIHelper.dump(colors.green(`Database seeded successfully with seeder class ${seederClass}`));
         }
     }
     static getUpDownOptions(flags) {
@@ -196,23 +190,22 @@ class MigrationCommandFactory {
     }
     static getUpDownSuccessMessage(method, options) {
         const msg = `Successfully migrated ${method}`;
-        if (method === 'down' && core_1.Utils.isEmpty(options)) {
+        if (method === 'down' && Utils.isEmpty(options)) {
             return msg + ' to previous version';
         }
         if (options.to === 0) {
             const v = { down: 'first', up: 'latest' }[method];
             return `${msg} to the ${v} version`;
         }
-        if (method === 'up' && core_1.Utils.isEmpty(options)) {
+        if (method === 'up' && Utils.isEmpty(options)) {
             return msg + ' to the latest version';
         }
-        if (core_1.Utils.isString(options.to)) {
+        if (typeof options.to === 'string') {
             return msg + ' to version ' + options.to;
         }
-        if (options.migrations && options.migrations.length === 1) {
+        if (options.migrations?.length === 1) {
             return msg + ' to version ' + options.migrations[0];
         }
         return msg;
     }
 }
-exports.MigrationCommandFactory = MigrationCommandFactory;

package/commands/SchemaCommandFactory.d.ts

@@ -1,5 +1,5 @@
 import type { ArgumentsCamelCase, Argv } from 'yargs';
-import type { BaseArgs } from '../CLIConfigurator';
+import type { BaseArgs } from '../CLIConfigurator.js';
 export declare class SchemaCommandFactory {
     static readonly DESCRIPTIONS: {
         readonly create: "Create database schema based on current metadata";

package/commands/SchemaCommandFactory.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SchemaCommandFactory = void 0;
-const core_1 = require("@mikro-orm/core");
-const CLIHelper_1 = require("../CLIHelper");
-class SchemaCommandFactory {
+import { colors } from '@mikro-orm/core';
+import { CLIHelper } from '../CLIHelper.js';
+export class SchemaCommandFactory {
     static DESCRIPTIONS = {
         create: 'Create database schema based on current metadata',
         update: 'Update database schema based on current metadata',
@@ -80,17 +77,16 @@ class SchemaCommandFactory {
     }
     static async handleSchemaCommand(args, method, successMessage) {
         if (!args.run && !args.dump) {
-            return CLIHelper_1.CLIHelper.showHelp();
+            return CLIHelper.showHelp();
         }
-        const orm = await CLIHelper_1.CLIHelper.getORM(args.contextName, args.config);
-        const generator = orm.getSchemaGenerator();
+        const orm = await CLIHelper.getORM(args.contextName, args.config);
         const params = { wrap: args.fkChecks == null ? undefined : !args.fkChecks, ...args };
         if (args.dump) {
             const m = `get${method.substr(0, 1).toUpperCase()}${method.substr(1)}SchemaSQL`;
-            const dump = await generator[m](params);
-            /* istanbul ignore next */
+            const dump = await orm.schema[m](params);
+            /* v8 ignore if */
             if (dump) {
-                CLIHelper_1.CLIHelper.dump(dump, orm.config);
+                CLIHelper.dump(dump, orm.config);
                 successMessage = '';
             }
             else {
@@ -98,19 +94,15 @@ class SchemaCommandFactory {
             }
         }
         else if (method === 'fresh') {
-            await generator.dropSchema(params);
-            await generator.createSchema(params);
+            await orm.schema.refresh(params);
         }
         else {
-            const m = method + 'Schema';
-            await generator[m](params);
+            await orm.schema[method](params);
         }
         if (typeof args.seed !== 'undefined') {
-            const seeder = orm.getSeeder();
-            await seeder.seedString(args.seed || orm.config.get('seeder').defaultSeeder);
+            await orm.seeder.seedString(args.seed || orm.config.get('seeder').defaultSeeder);
         }
-        CLIHelper_1.CLIHelper.dump(core_1.colors.green(successMessage));
+        CLIHelper.dump(colors.green(successMessage));
         await orm.close(true);
     }
 }
-exports.SchemaCommandFactory = SchemaCommandFactory;

package/index.d.ts

@@ -2,5 +2,5 @@
  * @packageDocumentation
  * @module cli
  */
-export * from './CLIHelper';
-export * from './CLIConfigurator';
+export * from './CLIHelper.js';
+export * from './CLIConfigurator.js';

package/index.js

@@ -1,22 +1,6 @@
-"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 });
 /**
  * @packageDocumentation
  * @module cli
  */
-__exportStar(require("./CLIHelper"), exports);
-__exportStar(require("./CLIConfigurator"), exports);
+export * from './CLIHelper.js';
+export * from './CLIConfigurator.js';

package/package.json

@@ -1,19 +1,11 @@
 {
   "name": "@mikro-orm/cli",
-  "version": "7.0.0-dev.1",
+  "type": "module",
+  "version": "7.0.0-dev.100",
   "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",
   "exports": {
     "./package.json": "./package.json",
-    ".": {
-      "import": {
-        "types": "./index.d.ts",
-        "default": "./index.mjs"
-      },
-      "require": "./index.js"
-    }
+    ".": "./index.js"
   },
   "repository": {
     "type": "git",
@@ -46,14 +38,13 @@
   },
   "homepage": "https://mikro-orm.io",
   "bin": {
-    "mikro-orm": "./cli",
-    "mikro-orm-esm": "./esm"
+    "mikro-orm": "./cli"
   },
   "engines": {
-    "node": ">= 22.11.0"
+    "node": ">= 22.17.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"
@@ -62,16 +53,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@jercle/yargonaut": "1.1.5",
-    "@mikro-orm/core": "7.0.0-dev.1",
-    "@mikro-orm/knex": "7.0.0-dev.1",
-    "fs-extra": "11.3.0",
-    "tsconfig-paths": "4.2.0",
+    "@mikro-orm/core": "7.0.0-dev.100",
+    "mikro-orm": "7.0.0-dev.100",
     "yargs": "17.7.2"
-  },
-  "devDependencies": {
-    "@mikro-orm/entity-generator": "^6.4.5",
-    "@mikro-orm/migrations": "^6.4.5",
-    "@mikro-orm/seeder": "^6.4.5"
   }
 }

package/esm

@@ -1,18 +0,0 @@
-#!/usr/bin/env -S node --loader ts-node/esm --no-warnings=ExperimentalWarning
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-require('@jercle/yargonaut')
-    .style('blue')
-    .style('yellow', 'required')
-    .helpStyle('green')
-    .errorsStyle('red');
-const CLIHelper_1 = require("./CLIHelper");
-const CLIConfigurator_1 = require("./CLIConfigurator");
-void (async () => {
-    const argv = CLIConfigurator_1.CLIConfigurator.configure();
-    const args = await argv.parse(process.argv.slice(2));
-    if (args._.length === 0) {
-        CLIHelper_1.CLIHelper.showHelp();
-    }
-})();

package/esm.cmd

@@ -1,3 +0,0 @@
-@echo off
-
-node --loader ts-node/esm --no-warnings=ExperimentalWarning "%~dp0\esm" %*

package/esm.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env -S node --loader ts-node/esm --no-warnings=ExperimentalWarning
-export {};

package/esm.js

@@ -1,18 +0,0 @@
-#!/usr/bin/env -S node --loader ts-node/esm --no-warnings=ExperimentalWarning
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-require('@jercle/yargonaut')
-    .style('blue')
-    .style('yellow', 'required')
-    .helpStyle('green')
-    .errorsStyle('red');
-const CLIHelper_1 = require("./CLIHelper");
-const CLIConfigurator_1 = require("./CLIConfigurator");
-void (async () => {
-    const argv = CLIConfigurator_1.CLIConfigurator.configure();
-    const args = await argv.parse(process.argv.slice(2));
-    if (args._.length === 0) {
-        CLIHelper_1.CLIHelper.showHelp();
-    }
-})();

package/index.mjs

@@ -1,5 +0,0 @@
-import mod from "./index.js";
-
-export default mod;
-export const CLIConfigurator = mod.CLIConfigurator;
-export const CLIHelper = mod.CLIHelper;