@hesed/mysql 0.5.0 → 0.5.2

package/README.md

@@ -26,7 +26,7 @@ $ npm install -g @hesed/mysql
 $ mq COMMAND
 running command...
 $ mq (--version)
-@hesed/mysql/0.5.0 linux-x64 node-v24.16.0
+@hesed/mysql/0.5.2 linux-x64 node-v24.17.0
 $ mq --help [COMMAND]
 USAGE
   $ mq COMMAND
@@ -45,7 +45,7 @@ USAGE
 * [`mq mysql auth update`](#mq-mysql-auth-update)
 * [`mq mysql databases`](#mq-mysql-databases)
 * [`mq mysql describe-table TABLE`](#mq-mysql-describe-table-table)
-* [`mq mysql explain-query QUERY`](#mq-mysql-explain-query-query)
+* [`mq mysql explain QUERY`](#mq-mysql-explain-query)
 * [`mq mysql indexes TABLE`](#mq-mysql-indexes-table)
 * [`mq mysql query QUERY`](#mq-mysql-query-query)
 * [`mq mysql tables`](#mq-mysql-tables)
@@ -80,7 +80,7 @@ EXAMPLES
   $ mq mysql auth add -p prod
 ```
 
-_See code: [src/commands/mysql/auth/add.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/auth/add.ts)_
+_See code: [src/commands/mysql/auth/add.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/auth/add.ts)_
 
 ## `mq mysql auth delete`
 
@@ -105,7 +105,7 @@ EXAMPLES
   $ mq mysql auth delete -p prod
 ```
 
-_See code: [src/commands/mysql/auth/delete.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/auth/delete.ts)_
+_See code: [src/commands/mysql/auth/delete.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/auth/delete.ts)_
 
 ## `mq mysql auth list`
 
@@ -125,7 +125,7 @@ EXAMPLES
   $ mq mysql auth list
 ```
 
-_See code: [src/commands/mysql/auth/list.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/auth/list.ts)_
+_See code: [src/commands/mysql/auth/list.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/auth/list.ts)_
 
 ## `mq mysql auth profile`
 
@@ -150,7 +150,7 @@ EXAMPLES
   $ mq mysql auth profile --default test
 ```
 
-_See code: [src/commands/mysql/auth/profile.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/auth/profile.ts)_
+_See code: [src/commands/mysql/auth/profile.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/auth/profile.ts)_
 
 ## `mq mysql auth test`
 
@@ -175,7 +175,7 @@ EXAMPLES
   $ mq mysql auth test -p prod
 ```
 
-_See code: [src/commands/mysql/auth/test.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/auth/test.ts)_
+_See code: [src/commands/mysql/auth/test.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/auth/test.ts)_
 
 ## `mq mysql auth update`
 
@@ -207,7 +207,7 @@ EXAMPLES
   $ mq mysql auth update -p test
 ```
 
-_See code: [src/commands/mysql/auth/update.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/auth/update.ts)_
+_See code: [src/commands/mysql/auth/update.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/auth/update.ts)_
 
 ## `mq mysql databases`
 
@@ -215,11 +215,14 @@ List all databases accessible on the MySQL server
 
 ```
 USAGE
-  $ mq mysql databases [-p <value>]
+  $ mq mysql databases [--json] [-p <value>]
 
 FLAGS
   -p, --profile=<value>  Database profile name from config
 
+GLOBAL FLAGS
+  --json  Format output as json.
+
 DESCRIPTION
   List all databases accessible on the MySQL server
 
@@ -229,7 +232,7 @@ EXAMPLES
   $ mq mysql databases -p staging
 ```
 
-_See code: [src/commands/mysql/databases.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/databases.ts)_
+_See code: [src/commands/mysql/databases.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/databases.ts)_
 
 ## `mq mysql describe-table TABLE`
 
@@ -237,15 +240,17 @@ Describe the structure of a MySQL table
 
 ```
 USAGE
-  $ mq mysql describe-table TABLE [--format table|json|toon] [-p <value>]
+  $ mq mysql describe-table TABLE [--json] [-p <value>] [--toon]
 
 ARGUMENTS
   TABLE  Table name to describe
 
 FLAGS
   -p, --profile=<value>  Database profile name from config
-      --format=<option>  [default: table] Output format
-                         <options: table|json|toon>
+      --toon             Format output as toon
+
+GLOBAL FLAGS
+  --json  Format output as json.
 
 DESCRIPTION
   Describe the structure of a MySQL table
@@ -253,37 +258,39 @@ DESCRIPTION
 EXAMPLES
   $ mq mysql describe-table users
 
-  $ mq mysql describe-table orders --format json -p prod
+  $ mq mysql describe-table orders --toon -p prod
 ```
 
-_See code: [src/commands/mysql/describe-table.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/describe-table.ts)_
+_See code: [src/commands/mysql/describe-table.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/describe-table.ts)_
 
-## `mq mysql explain-query QUERY`
+## `mq mysql explain QUERY`
 
 Show the execution plan for a MySQL query
 
 ```
 USAGE
-  $ mq mysql explain-query QUERY [--format table|json|toon] [-p <value>]
+  $ mq mysql explain QUERY [--json] [-p <value>] [--toon]
 
 ARGUMENTS
   QUERY  SQL query to explain
 
 FLAGS
   -p, --profile=<value>  Database profile name from config
-      --format=<option>  [default: table] Output format
-                         <options: table|json|toon>
+      --toon             Format output as toon
+
+GLOBAL FLAGS
+  --json  Format output as json.
 
 DESCRIPTION
   Show the execution plan for a MySQL query
 
 EXAMPLES
-  $ mq mysql explain-query "SELECT * FROM users WHERE id = 1"
+  $ mq mysql explain "SELECT * FROM users WHERE id = 1"
 
-  $ mq mysql explain-query "SELECT * FROM orders JOIN users ON orders.user_id = users.id" --format json
+  $ mq mysql explain "SELECT * FROM orders JOIN users ON orders.user_id = users.id" --json
 ```
 
-_See code: [src/commands/mysql/explain-query.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/explain-query.ts)_
+_See code: [src/commands/mysql/explain.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/explain.ts)_
 
 ## `mq mysql indexes TABLE`
 
@@ -291,15 +298,17 @@ Show indexes for a MySQL table
 
 ```
 USAGE
-  $ mq mysql indexes TABLE [--format table|json|toon] [-p <value>]
+  $ mq mysql indexes TABLE [--json] [-p <value>] [--toon]
 
 ARGUMENTS
   TABLE  Table name to show indexes for
 
 FLAGS
   -p, --profile=<value>  Database profile name from config
-      --format=<option>  [default: table] Output format
-                         <options: table|json|toon>
+      --toon             Format output as toon
+
+GLOBAL FLAGS
+  --json  Format output as json.
 
 DESCRIPTION
   Show indexes for a MySQL table
@@ -307,10 +316,10 @@ DESCRIPTION
 EXAMPLES
   $ mq mysql indexes users
 
-  $ mq mysql indexes orders --format json -p prod
+  $ mq mysql indexes orders --json -p prod
 ```
 
-_See code: [src/commands/mysql/indexes.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/indexes.ts)_
+_See code: [src/commands/mysql/indexes.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/indexes.ts)_
 
 ## `mq mysql query QUERY`
 
@@ -318,29 +327,31 @@ Execute a SQL query against a MySQL database
 
 ```
 USAGE
-  $ mq mysql query QUERY [--format table|json|csv|toon] [-p <value>] [--skip-confirmation]
+  $ mq mysql query QUERY [--json] [-p <value>] [--skip-confirmation] [--toon]
 
 ARGUMENTS
   QUERY  SQL query to execute
 
 FLAGS
   -p, --profile=<value>    Database profile name from config
-      --format=<option>    [default: table] Output format
-                           <options: table|json|csv|toon>
       --skip-confirmation  Skip confirmation prompt for destructive operations
+      --toon               Format output as toon
+
+GLOBAL FLAGS
+  --json  Format output as json.
 
 DESCRIPTION
   Execute a SQL query against a MySQL database
 
 EXAMPLES
-  $ mq mysql query "SELECT * FROM users LIMIT 10"
+  $ mq mysql query "SELECT * FROM users LIMIT 10" --json
 
-  $ mq mysql query "UPDATE users SET email = 'user@email.com' WHERE id = 999" --format json
+  $ mq mysql query "UPDATE users SET email = 'user@email.com' WHERE id = 999"
 
   $ mq mysql query "DELETE FROM sessions" -p prod --skip-confirmation
 ```
 
-_See code: [src/commands/mysql/query.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/query.ts)_
+_See code: [src/commands/mysql/query.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/query.ts)_
 
 ## `mq mysql tables`
 
@@ -348,11 +359,14 @@ List all tables in the current MySQL database
 
 ```
 USAGE
-  $ mq mysql tables [-p <value>]
+  $ mq mysql tables [--json] [-p <value>]
 
 FLAGS
   -p, --profile=<value>  Database profile name from config
 
+GLOBAL FLAGS
+  --json  Format output as json.
+
 DESCRIPTION
   List all tables in the current MySQL database
 
@@ -362,5 +376,5 @@ EXAMPLES
   $ mq mysql tables -p local
 ```
 
-_See code: [src/commands/mysql/tables.ts](https://github.com/hesedcasa/mysql/blob/v0.5.0/src/commands/mysql/tables.ts)_
+_See code: [src/commands/mysql/tables.ts](https://github.com/hesedcasa/mysql/blob/v0.5.2/src/commands/mysql/tables.ts)_
 <!-- commandsstop -->

package/dist/base-command.d.ts

@@ -0,0 +1,10 @@
+import { Command } from '@oclif/core';
+export declare abstract class BaseCommand extends Command {
+    static enableJsonFlag: boolean;
+    jsonEnabled(): boolean;
+    protected parse(options?: any, argv?: string[]): Promise<any>;
+    protected parseJsonOutput(output?: string): unknown;
+    protected toErrorJson(err: unknown): {
+        error: string;
+    };
+}

package/dist/base-command.js

@@ -0,0 +1,37 @@
+import { Command } from '@oclif/core';
+export class BaseCommand extends Command {
+    static enableJsonFlag = true;
+    jsonEnabled() {
+        const separatorIndex = this.argv.indexOf('--');
+        const flagArgs = separatorIndex === -1 ? this.argv : this.argv.slice(0, separatorIndex);
+        return flagArgs.includes('--json');
+    }
+    // oclif sets this.parsed=true only after Parser.parse() returns successfully.
+    // When parse() throws (e.g. missing required arg), this.parsed stays false and
+    // _run() emits an UnparsedCommand warning. The finally block prevents that.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async parse(options, argv) {
+        try {
+            return await super.parse(options, argv);
+        }
+        finally {
+            this.parsed = true;
+        }
+    }
+    parseJsonOutput(output) {
+        if (!output)
+            return null;
+        try {
+            return JSON.parse(output);
+        }
+        catch {
+            return output;
+        }
+    }
+    // oclif's default toErrorJson returns the raw error object which for
+    // CLIParseError includes context:this (the full config). Strip it down.
+    toErrorJson(err) {
+        const message = err instanceof Error ? err.message : String(err);
+        return { error: message };
+    }
+}

package/dist/commands/mysql/databases.d.ts

@@ -1,9 +1,10 @@
-import { Command } from '@oclif/core';
-export default class MySQLDatabases extends Command {
+import type { ApiResult } from '@hesed/plugin-lib';
+import { BaseCommand } from '../../base-command.js';
+export default class MySQLDatabases extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
-    run(): Promise<void>;
+    run(): Promise<ApiResult>;
 }

package/dist/commands/mysql/databases.js

@@ -1,6 +1,7 @@
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
+import { BaseCommand } from '../../base-command.js';
 import { closeConnections, listDatabases } from '../../mysql/index.js';
-export default class MySQLDatabases extends Command {
+export default class MySQLDatabases extends BaseCommand {
     static description = 'List all databases accessible on the MySQL server';
     static examples = ['<%= config.bin %> <%= command.id %>', '<%= config.bin %> <%= command.id %> -p staging'];
     static flags = {
@@ -11,10 +12,10 @@ export default class MySQLDatabases extends Command {
         const result = await listDatabases(this.config, flags.profile);
         await closeConnections();
         if (result.success) {
-            this.logJson(result.databases);
-        }
-        else {
-            this.error(result.error ?? 'Failed to list databases');
+            this.log(result.data?.result ?? '');
+            delete result.data.result;
+            return result;
         }
+        this.error(String(result.error ?? 'Failed to list databases'));
     }
 }

package/dist/commands/mysql/describe-table.d.ts

@@ -1,13 +1,14 @@
-import { Command } from '@oclif/core';
-export default class MySQLDescribeTable extends Command {
+import { ApiResult } from '@hesed/plugin-lib';
+import { BaseCommand } from '../../base-command.js';
+export default class MySQLDescribeTable extends BaseCommand {
     static args: {
         table: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
     static examples: string[];
     static flags: {
-        format: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        toon: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    run(): Promise<void>;
+    run(): Promise<ApiResult>;
 }

package/dist/commands/mysql/describe-table.js

@@ -1,31 +1,28 @@
-import { Args, Command, Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
+import { BaseCommand } from '../../base-command.js';
 import { closeConnections, describeTable } from '../../mysql/index.js';
-export default class MySQLDescribeTable extends Command {
+export default class MySQLDescribeTable extends BaseCommand {
     static args = {
         table: Args.string({ description: 'Table name to describe', required: true }),
     };
     static description = 'Describe the structure of a MySQL table';
     static examples = [
         '<%= config.bin %> <%= command.id %> users',
-        '<%= config.bin %> <%= command.id %> orders --format json -p prod',
+        '<%= config.bin %> <%= command.id %> orders --toon -p prod',
     ];
     static flags = {
-        format: Flags.string({
-            default: 'table',
-            description: 'Output format',
-            options: ['table', 'json', 'toon'],
-        }),
         profile: Flags.string({ char: 'p', description: 'Database profile name from config', required: false }),
+        toon: Flags.boolean({ description: 'Format output as toon', required: false }),
     };
     async run() {
         const { args, flags } = await this.parse(MySQLDescribeTable);
-        const result = await describeTable(this.config, args.table, flags.profile, flags.format);
+        const result = await describeTable(this.config, args.table, flags.profile, flags.toon ? 'toon' : flags.json ? 'json' : 'table');
         await closeConnections();
         if (result.success) {
-            this.log(result.result ?? '');
-        }
-        else {
-            this.error(result.error ?? 'Failed to describe table');
+            this.log(result.data?.result ?? '');
+            delete result.data.result;
+            return result;
         }
+        this.error(String(result.error ?? 'Failed to describe table'));
     }
 }

package/dist/commands/mysql/{explain-query.d.ts → explain.d.ts}

@@ -1,13 +1,14 @@
-import { Command } from '@oclif/core';
-export default class MySQLExplain extends Command {
+import { ApiResult } from '@hesed/plugin-lib';
+import { BaseCommand } from '../../base-command.js';
+export default class MySQLExplain extends BaseCommand {
     static args: {
         query: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
     static examples: string[];
     static flags: {
-        format: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        toon: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    run(): Promise<void>;
+    run(): Promise<ApiResult>;
 }

package/dist/commands/mysql/{explain-query.js → explain.js}

@@ -1,31 +1,28 @@
-import { Args, Command, Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
+import { BaseCommand } from '../../base-command.js';
 import { closeConnections, explainQuery } from '../../mysql/index.js';
-export default class MySQLExplain extends Command {
+export default class MySQLExplain extends BaseCommand {
     static args = {
         query: Args.string({ description: 'SQL query to explain', required: true }),
     };
     static description = 'Show the execution plan for a MySQL query';
     static examples = [
         '<%= config.bin %> <%= command.id %> "SELECT * FROM users WHERE id = 1"',
-        '<%= config.bin %> <%= command.id %> "SELECT * FROM orders JOIN users ON orders.user_id = users.id" --format json',
+        '<%= config.bin %> <%= command.id %> "SELECT * FROM orders JOIN users ON orders.user_id = users.id" --json',
     ];
     static flags = {
-        format: Flags.string({
-            default: 'table',
-            description: 'Output format',
-            options: ['table', 'json', 'toon'],
-        }),
         profile: Flags.string({ char: 'p', description: 'Database profile name from config', required: false }),
+        toon: Flags.boolean({ description: 'Format output as toon', required: false }),
     };
     async run() {
         const { args, flags } = await this.parse(MySQLExplain);
-        const result = await explainQuery(this.config, args.query, flags.profile, flags.format);
+        const result = await explainQuery(this.config, args.query, flags.profile, flags.toon ? 'toon' : flags.json ? 'json' : 'table');
         await closeConnections();
         if (result.success) {
-            this.log(result.result ?? '');
-        }
-        else {
-            this.error(result.error ?? 'Failed to explain query');
+            this.log(result.data?.result ?? '');
+            delete result.data.result;
+            return result;
         }
+        this.error(String(result.error ?? 'Failed to explain query'));
     }
 }

package/dist/commands/mysql/indexes.d.ts

@@ -1,13 +1,14 @@
-import { Command } from '@oclif/core';
-export default class MySQLIndexes extends Command {
+import { ApiResult } from '@hesed/plugin-lib';
+import { BaseCommand } from '../../base-command.js';
+export default class MySQLIndexes extends BaseCommand {
     static args: {
         table: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
     static examples: string[];
     static flags: {
-        format: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        toon: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    run(): Promise<void>;
+    run(): Promise<ApiResult>;
 }

package/dist/commands/mysql/indexes.js

@@ -1,31 +1,28 @@
-import { Args, Command, Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
+import { BaseCommand } from '../../base-command.js';
 import { closeConnections, showIndexes } from '../../mysql/index.js';
-export default class MySQLIndexes extends Command {
+export default class MySQLIndexes extends BaseCommand {
     static args = {
         table: Args.string({ description: 'Table name to show indexes for', required: true }),
     };
     static description = 'Show indexes for a MySQL table';
     static examples = [
         '<%= config.bin %> <%= command.id %> users',
-        '<%= config.bin %> <%= command.id %> orders --format json -p prod',
+        '<%= config.bin %> <%= command.id %> orders --json -p prod',
     ];
     static flags = {
-        format: Flags.string({
-            default: 'table',
-            description: 'Output format',
-            options: ['table', 'json', 'toon'],
-        }),
         profile: Flags.string({ char: 'p', description: 'Database profile name from config', required: false }),
+        toon: Flags.boolean({ description: 'Format output as toon', required: false }),
     };
     async run() {
         const { args, flags } = await this.parse(MySQLIndexes);
-        const result = await showIndexes(this.config, args.table, flags.profile, flags.format);
+        const result = await showIndexes(this.config, args.table, flags.profile, flags.toon ? 'toon' : flags.json ? 'json' : 'table');
         await closeConnections();
         if (result.success) {
-            this.log(result.result ?? '');
-        }
-        else {
-            this.error(result.error ?? 'Failed to show indexes');
+            this.log(result.data?.result ?? '');
+            delete result.data.result;
+            return result;
         }
+        this.error(String(result.error ?? 'Failed to show indexes'));
     }
 }

package/dist/commands/mysql/query.d.ts

@@ -1,14 +1,15 @@
-import { Command } from '@oclif/core';
-export default class MySQLQuery extends Command {
+import { ApiResult } from '@hesed/plugin-lib';
+import { BaseCommand } from '../../base-command.js';
+export default class MySQLQuery extends BaseCommand {
     static args: {
         query: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
     static examples: string[];
     static flags: {
-        format: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'skip-confirmation': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        toon: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    run(): Promise<void>;
+    run(): Promise<ApiResult>;
 }

package/dist/commands/mysql/query.js

@@ -1,43 +1,43 @@
-import { Args, Command, Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
+import { BaseCommand } from '../../base-command.js';
 import { closeConnections, executeQuery } from '../../mysql/index.js';
-export default class MySQLQuery extends Command {
+export default class MySQLQuery extends BaseCommand {
     static args = {
         query: Args.string({ description: 'SQL query to execute', required: true }),
     };
     static description = 'Execute a SQL query against a MySQL database';
     static examples = [
-        '<%= config.bin %> <%= command.id %> "SELECT * FROM users LIMIT 10"',
-        '<%= config.bin %> <%= command.id %> "UPDATE users SET email = \'user@email.com\' WHERE id = 999" --format json',
+        '<%= config.bin %> <%= command.id %> "SELECT * FROM users LIMIT 10" --json',
+        '<%= config.bin %> <%= command.id %> "UPDATE users SET email = \'user@email.com\' WHERE id = 999"',
         '<%= config.bin %> <%= command.id %> "DELETE FROM sessions" -p prod --skip-confirmation',
     ];
     static flags = {
-        format: Flags.string({
-            default: 'table',
-            description: 'Output format',
-            options: ['table', 'json', 'csv', 'toon'],
-        }),
         profile: Flags.string({ char: 'p', description: 'Database profile name from config', required: false }),
         'skip-confirmation': Flags.boolean({
             default: false,
             description: 'Skip confirmation prompt for destructive operations',
         }),
+        toon: Flags.boolean({ description: 'Format output as toon', required: false }),
     };
     async run() {
         const { args, flags } = await this.parse(MySQLQuery);
-        const result = await executeQuery(this.config, args.query, flags.profile, flags.format, flags['skip-confirmation']);
+        const result = await executeQuery(this.config, args.query, flags.profile, flags.toon ? 'toon' : flags.json ? 'json' : 'table', flags['skip-confirmation']);
         await closeConnections();
         if (result.success) {
             // Notices (warnings, row counts) go to stderr so machine-readable formats
             // leave stdout as clean, parseable data.
-            if (result.notices)
-                this.logToStderr(result.notices);
-            this.log(result.result ?? '');
-        }
-        else if (result.requiresConfirmation) {
-            this.log(`${result.message ?? 'Destructive operation requires confirmation.'}\nRe-run with --skip-confirmation to proceed.`);
+            if (result.data?.notices)
+                this.logToStderr(result.data.notices);
+            // result is a formatted string for human/csv/toon output; for --json it
+            // holds the parsed payload, but jsonEnabled() suppresses log() in that case.
+            this.log(typeof result.data?.result === 'string' ? result.data.result : '');
+            delete result.data.notices;
+            return result;
         }
-        else {
-            this.error(result.error ?? 'Query failed');
+        if (result.data?.requiresConfirmation) {
+            this.log(`${result.data?.message ?? 'Destructive operation requires confirmation.'}\nRe-run with --skip-confirmation to proceed.`);
+            return result;
         }
+        this.error(String(result.error ?? 'Query failed'));
     }
 }

package/dist/commands/mysql/tables.d.ts

@@ -1,9 +1,10 @@
-import { Command } from '@oclif/core';
-export default class MySQLTables extends Command {
+import type { ApiResult } from '@hesed/plugin-lib';
+import { BaseCommand } from '../../base-command.js';
+export default class MySQLTables extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
-    run(): Promise<void>;
+    run(): Promise<ApiResult>;
 }

package/dist/commands/mysql/tables.js

@@ -1,6 +1,7 @@
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
+import { BaseCommand } from '../../base-command.js';
 import { closeConnections, listTables } from '../../mysql/index.js';
-export default class MySQLTables extends Command {
+export default class MySQLTables extends BaseCommand {
     static description = 'List all tables in the current MySQL database';
     static examples = ['<%= config.bin %> <%= command.id %>', '<%= config.bin %> <%= command.id %> -p local'];
     static flags = {
@@ -11,10 +12,10 @@ export default class MySQLTables extends Command {
         const result = await listTables(this.config, flags.profile);
         await closeConnections();
         if (result.success) {
-            this.logJson(result.tables);
-        }
-        else {
-            this.error(result.error ?? 'Failed to list tables');
+            this.log(result.data?.result ?? '');
+            delete result.data.result;
+            return result;
         }
+        this.error(String(result.error ?? 'Failed to list tables'));
     }
 }

package/dist/mysql/database.d.ts

@@ -1,49 +1,57 @@
-export interface QueryResult {
-    error?: string;
+import type { ApiResult } from '@hesed/plugin-lib';
+export type OutputFormat = 'csv' | 'json' | 'table' | 'toon';
+export interface QueryData {
     message?: string;
     notices?: string;
     requiresConfirmation?: boolean;
-    result?: string;
-    success: boolean;
+    result?: unknown;
 }
-export interface DatabaseListResult {
-    databases?: string[];
-    error?: string;
+export interface DatabaseListData {
+    databases: string[];
     result?: string;
-    success: boolean;
 }
-export interface TableListResult {
-    error?: string;
+export interface TableListData {
     result?: string;
-    success: boolean;
-    tables?: string[];
+    tables: string[];
 }
-export interface TableStructureResult {
-    error?: string;
+export interface TableStructureData {
     result?: string;
-    structure?: Record<string, unknown>[];
-    success: boolean;
+    structure: Record<string, unknown>[];
 }
-export interface IndexResult {
-    error?: string;
-    indexes?: Record<string, unknown>[];
+export interface IndexData {
+    indexes: Record<string, unknown>[];
     result?: string;
-    success: boolean;
 }
-export interface ExplainResult {
-    error?: string;
-    plan?: Record<string, unknown>[];
+export interface ExplainData {
+    plan: Record<string, unknown>[];
     result?: string;
-    success: boolean;
 }
-export interface ConnectionTestResult {
-    database?: string;
-    error?: string;
+interface ConnectionTestData {
+    database: string;
     result?: string;
-    success: boolean;
-    version?: string;
+    version: string;
 }
-export type OutputFormat = 'csv' | 'json' | 'table' | 'toon';
+export type QueryResult = ApiResult & {
+    data?: QueryData;
+};
+export type DatabaseListResult = ApiResult & {
+    data?: DatabaseListData;
+};
+export type TableListResult = ApiResult & {
+    data?: TableListData;
+};
+export type TableStructureResult = ApiResult & {
+    data?: TableStructureData;
+};
+export type IndexResult = ApiResult & {
+    data?: IndexData;
+};
+export type ExplainResult = ApiResult & {
+    data?: ExplainData;
+};
+export type ConnectionTestResult = ApiResult & {
+    data?: ConnectionTestData;
+};
 export interface DatabaseUtil {
     closeAll(): Promise<void>;
     describeTable(profileName: string, table: string, format?: OutputFormat): Promise<TableStructureResult>;
@@ -53,3 +61,4 @@ export interface DatabaseUtil {
     listTables(profileName: string): Promise<TableListResult>;
     showIndexes(profileName: string, table: string, format?: OutputFormat): Promise<IndexResult>;
 }
+export {};

package/dist/mysql/mysql-utils.js

@@ -19,8 +19,10 @@ export class MySQLUtil {
             const connection = await this.getConnection(profileName);
             const [rows, fields] = await connection.query(`DESCRIBE ${table}`);
             return {
-                result: this.formatRows(rows, fields, format),
-                structure: rows,
+                data: {
+                    result: this.formatRows(rows, fields, format),
+                    structure: rows,
+                },
                 success: true,
             };
         }
@@ -44,8 +46,10 @@ export class MySQLUtil {
             const confirmationCheck = requiresConfirmation(query, this.config.safety.requireConfirmationFor);
             if (confirmationCheck.required) {
                 return {
-                    message: `${confirmationCheck.message}\nQuery: ${query}`,
-                    requiresConfirmation: true,
+                    data: {
+                        message: `${confirmationCheck.message}\nQuery: ${query}`,
+                        requiresConfirmation: true,
+                    },
                     success: false,
                 };
             }
@@ -71,15 +75,20 @@ export class MySQLUtil {
             const connection = await this.getConnection(profileName);
             const [rows, fields] = await connection.query(finalQuery);
             const isRead = queryType === 'SELECT' || queryType === 'SHOW' || queryType === 'DESCRIBE' || queryType === 'EXPLAIN';
-            const data = isRead
+            let data = isRead
                 ? this.formatReadResult(rows, fields, format, notices)
-                : this.formatWriteResult(rows, notices);
+                : this.formatWriteResult(rows, notices, format);
+            if (format === 'json') {
+                data = JSON.parse(data);
+            }
             const notice = notices.join('\n\n');
             // For human (table) output everything stays on stdout, exactly as before.
             // For machine formats the data is returned alone and notices go to stderr.
             return {
-                notices: machineFormat ? notice : undefined,
-                result: machineFormat ? data : `${notice}\n\n${data}`,
+                data: {
+                    notices: machineFormat ? notice : undefined,
+                    result: machineFormat ? data : `${notice}\n\n${data}`,
+                },
                 success: true,
             };
         }
@@ -96,8 +105,10 @@ export class MySQLUtil {
             const connection = await this.getConnection(profileName);
             const [rows, fields] = await connection.query(`EXPLAIN ${query}`);
             return {
-                plan: rows,
-                result: this.formatRows(rows, fields, format),
+                data: {
+                    plan: rows,
+                    result: this.formatRows(rows, fields, format),
+                },
                 success: true,
             };
         }
@@ -115,8 +126,10 @@ export class MySQLUtil {
             const [rows] = await connection.query('SHOW DATABASES');
             const databases = rows.map((row) => row.Database);
             return {
-                databases,
-                result: `Databases:\n${databases.map((db) => `  • ${db}`).join('\n')}`,
+                data: {
+                    databases,
+                    result: `Databases:\n${databases.map((db) => `  • ${db}`).join('\n')}`,
+                },
                 success: true,
             };
         }
@@ -136,9 +149,11 @@ export class MySQLUtil {
             const tableKey = Object.keys(rowsArray[0])[0];
             const tables = rowsArray.map((row) => row[tableKey]);
             return {
-                result: `Tables in database:\n${tables.map((table) => `  • ${table}`).join('\n')}`,
+                data: {
+                    result: `Tables in database:\n${tables.map((table) => `  • ${table}`).join('\n')}`,
+                    tables,
+                },
                 success: true,
-                tables,
             };
         }
         catch (error) {
@@ -154,8 +169,10 @@ export class MySQLUtil {
             const connection = await this.getConnection(profileName);
             const [rows, fields] = await connection.query(`SHOW INDEXES FROM ${table}`);
             return {
-                indexes: rows,
-                result: this.formatRows(rows, fields, format),
+                data: {
+                    indexes: rows,
+                    result: this.formatRows(rows, fields, format),
+                },
                 success: true,
             };
         }
@@ -173,10 +190,12 @@ export class MySQLUtil {
             const [rows] = await connection.query('SELECT VERSION() as version, DATABASE() as current_database');
             const info = rows[0];
             return {
-                database: info.current_database,
-                result: `Connection successful!\n\nProfile: ${profileName}\nMySQL Version: ${info.version}\nCurrent Database: ${info.current_database}`,
+                data: {
+                    database: info.current_database,
+                    result: `Connection successful!\n\nProfile: ${profileName}\nMySQL Version: ${info.version}\nCurrent Database: ${info.current_database}`,
+                    version: info.version,
+                },
                 success: true,
-                version: info.version,
             };
         }
         catch (error) {
@@ -195,10 +214,18 @@ export class MySQLUtil {
     formatRows(rows, fields, format) {
         return FORMATTERS[format](rows, fields);
     }
-    formatWriteResult(rows, notices) {
+    formatWriteResult(rows, notices, format) {
         const affectedRows = rows.affectedRows ?? 0;
         const insertId = rows.insertId ?? null;
         notices.push('Query executed successfully.');
+        // The caller JSON.parses the result for json output, so emit valid JSON
+        // here rather than the human-readable string (which would throw on parse).
+        if (format === 'json') {
+            const payload = { affectedRows };
+            if (insertId)
+                payload.insertId = insertId;
+            return JSON.stringify(payload, null, 2);
+        }
         let data = `Affected rows: ${affectedRows}\n`;
         if (insertId)
             data += `Insert ID: ${insertId}\n`;

package/oclif.manifest.json

@@ -9,6 +9,13 @@
         "<%= config.bin %> <%= command.id %> -p staging"
       ],
       "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "profile": {
           "char": "p",
           "description": "Database profile name from config",
@@ -26,7 +33,7 @@
       "pluginName": "@hesed/mysql",
       "pluginType": "core",
       "strict": true,
-      "enableJsonFlag": false,
+      "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -47,21 +54,15 @@
       "description": "Describe the structure of a MySQL table",
       "examples": [
         "<%= config.bin %> <%= command.id %> users",
-        "<%= config.bin %> <%= command.id %> orders --format json -p prod"
+        "<%= config.bin %> <%= command.id %> orders --toon -p prod"
       ],
       "flags": {
-        "format": {
-          "description": "Output format",
-          "name": "format",
-          "default": "table",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "table",
-            "json",
-            "toon"
-          ],
-          "type": "option"
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
         },
         "profile": {
           "char": "p",
@@ -71,6 +72,13 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "toon": {
+          "description": "Format output as toon",
+          "name": "toon",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -80,7 +88,7 @@
       "pluginName": "@hesed/mysql",
       "pluginType": "core",
       "strict": true,
-      "enableJsonFlag": false,
+      "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -89,7 +97,7 @@
         "describe-table.js"
       ]
     },
-    "mysql:explain-query": {
+    "mysql:explain": {
       "aliases": [],
       "args": {
         "query": {
@@ -101,21 +109,15 @@
       "description": "Show the execution plan for a MySQL query",
       "examples": [
         "<%= config.bin %> <%= command.id %> \"SELECT * FROM users WHERE id = 1\"",
-        "<%= config.bin %> <%= command.id %> \"SELECT * FROM orders JOIN users ON orders.user_id = users.id\" --format json"
+        "<%= config.bin %> <%= command.id %> \"SELECT * FROM orders JOIN users ON orders.user_id = users.id\" --json"
       ],
       "flags": {
-        "format": {
-          "description": "Output format",
-          "name": "format",
-          "default": "table",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "table",
-            "json",
-            "toon"
-          ],
-          "type": "option"
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
         },
         "profile": {
           "char": "p",
@@ -125,22 +127,29 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "toon": {
+          "description": "Format output as toon",
+          "name": "toon",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "mysql:explain-query",
+      "id": "mysql:explain",
       "pluginAlias": "@hesed/mysql",
       "pluginName": "@hesed/mysql",
       "pluginType": "core",
       "strict": true,
-      "enableJsonFlag": false,
+      "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "dist",
         "commands",
         "mysql",
-        "explain-query.js"
+        "explain.js"
       ]
     },
     "mysql:indexes": {
@@ -155,21 +164,15 @@
       "description": "Show indexes for a MySQL table",
       "examples": [
         "<%= config.bin %> <%= command.id %> users",
-        "<%= config.bin %> <%= command.id %> orders --format json -p prod"
+        "<%= config.bin %> <%= command.id %> orders --json -p prod"
       ],
       "flags": {
-        "format": {
-          "description": "Output format",
-          "name": "format",
-          "default": "table",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "table",
-            "json",
-            "toon"
-          ],
-          "type": "option"
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
         },
         "profile": {
           "char": "p",
@@ -179,6 +182,13 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "toon": {
+          "description": "Format output as toon",
+          "name": "toon",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -188,7 +198,7 @@
       "pluginName": "@hesed/mysql",
       "pluginType": "core",
       "strict": true,
-      "enableJsonFlag": false,
+      "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -208,24 +218,17 @@
       },
       "description": "Execute a SQL query against a MySQL database",
       "examples": [
-        "<%= config.bin %> <%= command.id %> \"SELECT * FROM users LIMIT 10\"",
-        "<%= config.bin %> <%= command.id %> \"UPDATE users SET email = 'user@email.com' WHERE id = 999\" --format json",
+        "<%= config.bin %> <%= command.id %> \"SELECT * FROM users LIMIT 10\" --json",
+        "<%= config.bin %> <%= command.id %> \"UPDATE users SET email = 'user@email.com' WHERE id = 999\"",
         "<%= config.bin %> <%= command.id %> \"DELETE FROM sessions\" -p prod --skip-confirmation"
       ],
       "flags": {
-        "format": {
-          "description": "Output format",
-          "name": "format",
-          "default": "table",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "table",
-            "json",
-            "csv",
-            "toon"
-          ],
-          "type": "option"
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
         },
         "profile": {
           "char": "p",
@@ -241,6 +244,13 @@
           "name": "skip-confirmation",
           "allowNo": false,
           "type": "boolean"
+        },
+        "toon": {
+          "description": "Format output as toon",
+          "name": "toon",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -250,7 +260,7 @@
       "pluginName": "@hesed/mysql",
       "pluginType": "core",
       "strict": true,
-      "enableJsonFlag": false,
+      "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -268,6 +278,13 @@
         "<%= config.bin %> <%= command.id %> -p local"
       ],
       "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "profile": {
           "char": "p",
           "description": "Database profile name from config",
@@ -285,7 +302,7 @@
       "pluginName": "@hesed/mysql",
       "pluginType": "core",
       "strict": true,
-      "enableJsonFlag": false,
+      "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -640,5 +657,5 @@
       ]
     }
   },
-  "version": "0.5.0"
+  "version": "0.5.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hesed/mysql",
   "description": "CLI for MySQL database interaction",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "author": "Hesed",
   "bin": {
     "mq": "./bin/run.js"
@@ -49,7 +49,7 @@
   ],
   "homepage": "https://github.com/hesedcasa/mysql",
   "keywords": [
-    "oclif"
+    "mysql"
   ],
   "license": "Apache-2.0",
   "main": "dist/index.js",