@hesed/mysql 0.5.1 → 0.6.0

package/README.md

@@ -26,7 +26,7 @@ $ npm install -g @hesed/mysql
 $ mq COMMAND
 running command...
 $ mq (--version)
-@hesed/mysql/0.5.1 linux-x64 node-v24.17.0
+@hesed/mysql/0.6.0 linux-x64 node-v24.18.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)
@@ -57,16 +57,18 @@ Add MySQL authentication
 ```
 USAGE
   $ mq mysql auth add -p <value> --host <value> --port <value> -u <value> --password <value> -d <value> --ssl
-    [--json]
+    --maxConcurrentQueries <value> --queryQueueTimeoutMs <value> [--json]
 
 FLAGS
-  -d, --database=<value>  (required) Database name
-  -p, --profile=<value>   (required) Profile name
-  -u, --user=<value>      (required) Username
-      --host=<value>      (required) MySQL host
-      --password=<value>  (required) Password
-      --port=<value>      (required) MySQL port
-      --ssl               (required) Use SSL
+  -d, --database=<value>              (required) Database name
+  -p, --profile=<value>               (required) Profile name
+  -u, --user=<value>                  (required) Username
+      --host=<value>                  (required) MySQL host
+      --maxConcurrentQueries=<value>  (required) Max concurrent queries for this profile
+      --password=<value>              (required) Password
+      --port=<value>                  (required) MySQL port
+      --queryQueueTimeoutMs=<value>   (required) Milliseconds a query may wait for a free query slot before failing
+      --ssl                           (required) Use SSL
 
 GLOBAL FLAGS
   --json  Format output as json.
@@ -80,7 +82,7 @@ EXAMPLES
   $ mq mysql auth add -p prod
 ```
 
-_See code: [src/commands/mysql/auth/add.ts](https://github.com/hesedcasa/mysql/blob/v0.5.1/src/commands/mysql/auth/add.ts)_
+_See code: [src/commands/mysql/auth/add.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/auth/add.ts)_
 
 ## `mq mysql auth delete`
 
@@ -105,7 +107,7 @@ EXAMPLES
   $ mq mysql auth delete -p prod
 ```
 
-_See code: [src/commands/mysql/auth/delete.ts](https://github.com/hesedcasa/mysql/blob/v0.5.1/src/commands/mysql/auth/delete.ts)_
+_See code: [src/commands/mysql/auth/delete.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/auth/delete.ts)_
 
 ## `mq mysql auth list`
 
@@ -125,7 +127,7 @@ EXAMPLES
   $ mq mysql auth list
 ```
 
-_See code: [src/commands/mysql/auth/list.ts](https://github.com/hesedcasa/mysql/blob/v0.5.1/src/commands/mysql/auth/list.ts)_
+_See code: [src/commands/mysql/auth/list.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/auth/list.ts)_
 
 ## `mq mysql auth profile`
 
@@ -150,7 +152,7 @@ EXAMPLES
   $ mq mysql auth profile --default test
 ```
 
-_See code: [src/commands/mysql/auth/profile.ts](https://github.com/hesedcasa/mysql/blob/v0.5.1/src/commands/mysql/auth/profile.ts)_
+_See code: [src/commands/mysql/auth/profile.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/auth/profile.ts)_
 
 ## `mq mysql auth test`
 
@@ -175,7 +177,7 @@ EXAMPLES
   $ mq mysql auth test -p prod
 ```
 
-_See code: [src/commands/mysql/auth/test.ts](https://github.com/hesedcasa/mysql/blob/v0.5.1/src/commands/mysql/auth/test.ts)_
+_See code: [src/commands/mysql/auth/test.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/auth/test.ts)_
 
 ## `mq mysql auth update`
 
@@ -184,16 +186,18 @@ Update MySQL authentication
 ```
 USAGE
   $ mq mysql auth update -p <value> --host <value> --port <value> -u <value> --password <value> -d <value> --ssl
-    [--json]
+    --maxConcurrentQueries <value> --queryQueueTimeoutMs <value> [--json]
 
 FLAGS
-  -d, --database=<value>  (required) Database name
-  -p, --profile=<value>   (required) Profile name
-  -u, --user=<value>      (required) Username
-      --host=<value>      (required) MySQL host
-      --password=<value>  (required) Password
-      --port=<value>      (required) MySQL port
-      --ssl               (required) Use SSL
+  -d, --database=<value>              (required) Database name
+  -p, --profile=<value>               (required) Profile name
+  -u, --user=<value>                  (required) Username
+      --host=<value>                  (required) MySQL host
+      --maxConcurrentQueries=<value>  (required) Max concurrent queries for this profile
+      --password=<value>              (required) Password
+      --port=<value>                  (required) MySQL port
+      --queryQueueTimeoutMs=<value>   (required) Milliseconds a query may wait for a free query slot before failing
+      --ssl                           (required) Use SSL
 
 GLOBAL FLAGS
   --json  Format output as json.
@@ -207,7 +211,7 @@ EXAMPLES
   $ mq mysql auth update -p test
 ```
 
-_See code: [src/commands/mysql/auth/update.ts](https://github.com/hesedcasa/mysql/blob/v0.5.1/src/commands/mysql/auth/update.ts)_
+_See code: [src/commands/mysql/auth/update.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/auth/update.ts)_
 
 ## `mq mysql databases`
 
@@ -232,7 +236,7 @@ EXAMPLES
   $ mq mysql databases -p staging
 ```
 
-_See code: [src/commands/mysql/databases.ts](https://github.com/hesedcasa/mysql/blob/v0.5.1/src/commands/mysql/databases.ts)_
+_See code: [src/commands/mysql/databases.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/databases.ts)_
 
 ## `mq mysql describe-table TABLE`
 
@@ -240,15 +244,14 @@ Describe the structure of a MySQL table
 
 ```
 USAGE
-  $ mq mysql describe-table TABLE [--json] [--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.
@@ -259,26 +262,25 @@ 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.1/src/commands/mysql/describe-table.ts)_
+_See code: [src/commands/mysql/describe-table.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/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 [--json] [--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.
@@ -287,12 +289,12 @@ 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.1/src/commands/mysql/explain-query.ts)_
+_See code: [src/commands/mysql/explain.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/explain.ts)_
 
 ## `mq mysql indexes TABLE`
 
@@ -300,15 +302,14 @@ Show indexes for a MySQL table
 
 ```
 USAGE
-  $ mq mysql indexes TABLE [--json] [--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.
@@ -319,10 +320,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.1/src/commands/mysql/indexes.ts)_
+_See code: [src/commands/mysql/indexes.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/indexes.ts)_
 
 ## `mq mysql query QUERY`
 
@@ -330,16 +331,15 @@ Execute a SQL query against a MySQL database
 
 ```
 USAGE
-  $ mq mysql query QUERY [--json] [--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.
@@ -348,14 +348,14 @@ 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.1/src/commands/mysql/query.ts)_
+_See code: [src/commands/mysql/query.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/query.ts)_
 
 ## `mq mysql tables`
 
@@ -363,11 +363,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
 
@@ -377,5 +380,5 @@ EXAMPLES
   $ mq mysql tables -p local
 ```
 
-_See code: [src/commands/mysql/tables.ts](https://github.com/hesedcasa/mysql/blob/v0.5.1/src/commands/mysql/tables.ts)_
+_See code: [src/commands/mysql/tables.ts](https://github.com/hesedcasa/mysql/blob/v0.6.0/src/commands/mysql/tables.ts)_
 <!-- commandsstop -->

package/dist/base-command.d.ts

@@ -7,6 +7,4 @@ export declare abstract class BaseCommand extends Command {
     protected toErrorJson(err: unknown): {
         error: string;
     };
-    private formatFlagValue;
-    private hasFormatFlag;
 }

package/dist/base-command.js

@@ -4,8 +4,6 @@ export class BaseCommand extends Command {
     jsonEnabled() {
         const separatorIndex = this.argv.indexOf('--');
         const flagArgs = separatorIndex === -1 ? this.argv : this.argv.slice(0, separatorIndex);
-        if (this.hasFormatFlag(flagArgs))
-            return this.formatFlagValue(flagArgs) === 'json';
         return flagArgs.includes('--json');
     }
     // oclif sets this.parsed=true only after Parser.parse() returns successfully.
@@ -36,15 +34,4 @@ export class BaseCommand extends Command {
         const message = err instanceof Error ? err.message : String(err);
         return { error: message };
     }
-    formatFlagValue(flagArgs) {
-        for (const [index, arg] of flagArgs.entries()) {
-            if (arg === '--format')
-                return flagArgs[index + 1];
-            if (arg.startsWith('--format='))
-                return arg.slice('--format='.length);
-        }
-    }
-    hasFormatFlag(flagArgs) {
-        return flagArgs.some((arg) => arg === '--format' || arg.startsWith('--format='));
-    }
 }

package/dist/commands/mysql/auth/add.js

@@ -7,6 +7,20 @@ const fields = [
     { description: 'Password', name: 'password', type: 'string' },
     { char: 'd', description: 'Database name', name: 'database', type: 'string' },
     { default: false, description: 'Use SSL', name: 'ssl', required: false, type: 'boolean' },
+    {
+        default: 5,
+        description: 'Max concurrent queries for this profile',
+        name: 'maxConcurrentQueries',
+        required: false,
+        type: 'number',
+    },
+    {
+        default: 60_000,
+        description: 'Milliseconds a query may wait for a free query slot before failing',
+        name: 'queryQueueTimeoutMs',
+        required: false,
+        type: 'number',
+    },
 ];
 export default createAuthAddCommand({
     clearClients: closeConnections,

package/dist/commands/mysql/auth/update.js

@@ -7,6 +7,20 @@ const fields = [
     { description: 'Password', name: 'password', type: 'string' },
     { char: 'd', description: 'Database name', name: 'database', type: 'string' },
     { default: false, description: 'Use SSL', name: 'ssl', required: false, type: 'boolean' },
+    {
+        default: 5,
+        description: 'Max concurrent queries for this profile',
+        name: 'maxConcurrentQueries',
+        required: false,
+        type: 'number',
+    },
+    {
+        default: 60_000,
+        description: 'Milliseconds a query may wait for a free query slot before failing',
+        name: 'queryQueueTimeoutMs',
+        required: false,
+        type: 'number',
+    },
 ];
 export default createAuthUpdateCommand({
     clearClients: closeConnections,

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

@@ -1,11 +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 enableJsonFlag: boolean;
     static examples: string[];
     static flags: {
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
-    jsonEnabled(): boolean;
-    run(): Promise<string[]>;
+    run(): Promise<ApiResult>;
 }

package/dist/commands/mysql/databases.js

@@ -1,22 +1,21 @@
-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 enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>', '<%= config.bin %> <%= command.id %> -p staging'];
     static flags = {
         profile: Flags.string({ char: 'p', description: 'Database profile name from config', required: false }),
     };
-    jsonEnabled() {
-        return true;
-    }
     async run() {
         const { flags } = await this.parse(MySQLDatabases);
         const result = await listDatabases(this.config, flags.profile);
         await closeConnections();
         if (result.success) {
-            return result.databases ?? [];
+            this.log(result.data?.result ?? '');
+            delete result.data.result;
+            return result;
         }
-        this.error(result.error ?? 'Failed to list databases');
+        this.error(String(result.error ?? 'Failed to list databases'));
     }
 }

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

@@ -1,3 +1,4 @@
+import { ApiResult } from '@hesed/plugin-lib';
 import { BaseCommand } from '../../base-command.js';
 export default class MySQLDescribeTable extends BaseCommand {
     static args: {
@@ -6,8 +7,8 @@ export default class MySQLDescribeTable extends BaseCommand {
     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<unknown>;
+    run(): Promise<ApiResult>;
 }

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

@@ -8,24 +8,21 @@ export default class MySQLDescribeTable extends BaseCommand {
     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 ?? '');
+            this.log(result.data?.result ?? '');
+            delete result.data.result;
             return result;
         }
-        this.error(result.error ?? 'Failed to describe table');
+        this.error(String(result.error ?? 'Failed to describe table'));
     }
 }

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

@@ -1,3 +1,4 @@
+import { ApiResult } from '@hesed/plugin-lib';
 import { BaseCommand } from '../../base-command.js';
 export default class MySQLExplain extends BaseCommand {
     static args: {
@@ -6,8 +7,8 @@ export default class MySQLExplain extends BaseCommand {
     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<unknown>;
+    run(): Promise<ApiResult>;
 }

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

@@ -8,24 +8,21 @@ export default class MySQLExplain extends BaseCommand {
     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 ?? '');
+            this.log(result.data?.result ?? '');
+            delete result.data.result;
             return result;
         }
-        this.error(result.error ?? 'Failed to explain query');
+        this.error(String(result.error ?? 'Failed to explain query'));
     }
 }

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

@@ -1,3 +1,4 @@
+import { ApiResult } from '@hesed/plugin-lib';
 import { BaseCommand } from '../../base-command.js';
 export default class MySQLIndexes extends BaseCommand {
     static args: {
@@ -6,8 +7,8 @@ export default class MySQLIndexes extends BaseCommand {
     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<unknown>;
+    run(): Promise<ApiResult>;
 }

package/dist/commands/mysql/indexes.js

@@ -8,24 +8,21 @@ export default class MySQLIndexes extends BaseCommand {
     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 ?? '');
+            this.log(result.data?.result ?? '');
+            delete result.data.result;
             return result;
         }
-        this.error(result.error ?? 'Failed to show indexes');
+        this.error(String(result.error ?? 'Failed to show indexes'));
     }
 }

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

@@ -1,3 +1,4 @@
+import { ApiResult } from '@hesed/plugin-lib';
 import { BaseCommand } from '../../base-command.js';
 export default class MySQLQuery extends BaseCommand {
     static args: {
@@ -6,9 +7,9 @@ export default class MySQLQuery extends BaseCommand {
     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<unknown>;
+    run(): Promise<ApiResult>;
 }

package/dist/commands/mysql/query.js

@@ -7,40 +7,37 @@ export default class MySQLQuery extends BaseCommand {
     };
     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);
-            if (this.jsonEnabled())
-                return this.parseJsonOutput(result.result);
-            this.log(result.result ?? '');
+            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;
         }
-        if (result.requiresConfirmation) {
-            this.log(`${result.message ?? 'Destructive operation requires confirmation.'}\nRe-run with --skip-confirmation to proceed.`);
+        if (result.data?.requiresConfirmation) {
+            this.log(`${result.data?.message ?? 'Destructive operation requires confirmation.'}\nRe-run with --skip-confirmation to proceed.`);
             return result;
         }
-        this.error(result.error ?? 'Query failed');
+        this.error(String(result.error ?? 'Query failed'));
     }
 }

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

@@ -1,10 +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>;
     };
-    jsonEnabled(): boolean;
-    run(): Promise<string[]>;
+    run(): Promise<ApiResult>;
 }