mpx-api 1.1.0 → 1.2.0

package/bin/mpx-api.js

@@ -36,9 +36,10 @@ program
   .name('mpx-api')
   .description('Developer-first API testing, mocking, and documentation CLI')
   .version(pkg.version)
-  .option('--json', 'Output structured JSON (machine-readable)')
-  .option('--quiet, -q', 'Suppress non-essential output')
-  .option('--schema', 'Output JSON schema describing all commands and flags');
+  .enablePositionalOptions()
+  .passThroughOptions()
+  .option('-o, --output <format>', 'Output format: json for structured JSON (machine-readable)')
+  .option('-q, --quiet', 'Suppress non-essential output');
 
 // Register HTTP method commands (get, post, put, patch, delete, head, options)
 registerRequestCommands(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpx-api",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Developer-first API testing, mocking, and documentation CLI with AI-native features (JSON output, MCP server)",
   "main": "src/index.js",
   "bin": {

package/src/commands/collection.js

@@ -1,7 +1,7 @@
 import { existsSync, readdirSync, readFileSync, writeFileSync } from 'fs';
 import { parse, stringify } from 'yaml';
 import { ensureLocalDir } from '../lib/config.js';
-import { formatSuccess, formatError, formatInfo } from '../lib/output.js';
+import { formatSuccess, formatError, formatInfo, formatWarning } from '../lib/output.js';
 import { runCollection } from '../lib/collection-runner.js';
 import { formatTestResults } from '../lib/output.js';
 import { join } from 'path';
@@ -95,7 +95,8 @@ export function registerCollectionCommands(program) {
     .description('Run a collection')
     .option('-e, --env <name>', 'Environment to use')
     .option('--base-url <url>', 'Override base URL')
-    .action(async (file, options) => {
+    .option('--json', 'Output results as JSON')
+    .action(async (file, options, command) => {
       try {
         const collectionPath = file || join('.mpx-api', 'collection.yaml');
         
@@ -123,9 +124,17 @@ export function registerCollectionCommands(program) {
         
         const results = await runCollection(collection, { env, baseUrl });
         
-        const allPassed = formatTestResults(results);
+        const globalOpts = command.optsWithGlobals();
+        const jsonOutput = options.json || globalOpts.output === 'json';
         
-        process.exit(allPassed ? 0 : 1);
+        if (jsonOutput) {
+          console.log(JSON.stringify(results, null, 2));
+          const allPassed = results.every(r => r.passed);
+          process.exit(allPassed ? 0 : 1);
+        } else {
+          const allPassed = formatTestResults(results);
+          process.exit(allPassed ? 0 : 1);
+        }
       } catch (err) {
         formatError(err);
         process.exit(1);
@@ -170,6 +179,4 @@ export function registerCollectionCommands(program) {
     });
 }
 
-function formatWarning(message) {
-  console.log(chalk.yellow('⚠'), message);
-}
+// formatWarning imported from output.js

package/src/commands/request.js

@@ -17,11 +17,12 @@ export function registerRequestCommands(program) {
       .option('--no-follow', 'Do not follow redirects')
       .option('--no-verify', 'Skip SSL certificate verification')
       .option('--timeout <ms>', 'Request timeout in milliseconds', '30000')
+      .option('-o, --output <format>', 'Output format (json)')
       .action(async (url, options, command) => {
         try {
           // Get global options
           const globalOpts = command.optsWithGlobals();
-          const jsonOutput = globalOpts.json || false;
+          const jsonOutput = options.output === 'json' || globalOpts.output === 'json';
           const quiet = options.quiet || globalOpts.quiet || false;
 
           const client = new HttpClient({
@@ -82,7 +83,7 @@ export function registerRequestCommands(program) {
           }
         } catch (err) {
           const globalOpts = command.optsWithGlobals();
-          if (globalOpts.json) {
+          if (options.output === 'json' || globalOpts.output === 'json') {
             console.log(JSON.stringify({ error: err.message, code: err.code || 'ERR_REQUEST' }));
           } else {
             formatError(err);

package/src/lib/assertion.js

@@ -1,3 +1,5 @@
+import { getNestedValue } from './utils.js';
+
 // Assertion engine for testing
 
 export function runAssertions(response, assertions) {
@@ -75,27 +77,7 @@ export function runAssertions(response, assertions) {
   return results;
 }
 
-function getNestedValue(obj, path) {
-  const parts = path.split('.');
-  let current = obj;
-  
-  for (const part of parts) {
-    if (current === null || current === undefined) return undefined;
-    
-    // Handle array indexing
-    const arrayMatch = part.match(/^(.+?)\[(\d+)\]$/);
-    if (arrayMatch) {
-      const [, key, index] = arrayMatch;
-      current = current[key];
-      if (!Array.isArray(current)) return undefined;
-      current = current[parseInt(index)];
-    } else {
-      current = current[part];
-    }
-  }
-  
-  return current;
-}
+// getNestedValue imported from utils.js
 
 function evaluateOperators(actual, expected) {
   for (const [op, value] of Object.entries(expected)) {

package/src/lib/http-client.js

@@ -1,8 +1,14 @@
 import { request } from 'undici';
 import { CookieJar } from 'tough-cookie';
 import { readFileSync, writeFileSync, existsSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
 import { getCookieJarPath } from './config.js';
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const pkgVersion = JSON.parse(readFileSync(join(__dirname, '../../package.json'), 'utf8')).version;
+
 export class HttpClient {
   constructor(options = {}) {
     this.followRedirects = options.followRedirects !== false;
@@ -40,7 +46,7 @@ export class HttpClient {
     
     // Set default User-Agent, allow override via options.headers
     const defaultHeaders = {
-      'user-agent': 'mpx-api/1.0.1',
+      'user-agent': `mpx-api/${pkgVersion}`,
     };
     
     // Merge headers, with user headers taking precedence
@@ -52,7 +58,18 @@ export class HttpClient {
       body: options.body,
     };
     
-    // Note: undici follows redirects by default, maxRedirections removed in newer versions
+    // Handle redirects
+    if (!this.followRedirects) {
+      requestOptions.maxRedirections = 0;
+    }
+
+    // Handle timeout
+    if (this.timeout) {
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+      requestOptions.signal = controller.signal;
+      requestOptions._timeoutId = timeoutId;
+    }
 
     // Add cookies to request
     const cookies = await this.cookieJar.getCookies(url);
@@ -72,7 +89,10 @@ export class HttpClient {
     }
 
     try {
+      const timeoutId = requestOptions._timeoutId;
+      delete requestOptions._timeoutId;
       const response = await request(url, requestOptions);
+      if (timeoutId) clearTimeout(timeoutId);
       
       // Store cookies from response
       const setCookieHeaders = response.headers['set-cookie'];
@@ -119,7 +139,9 @@ export class HttpClient {
       };
     } catch (err) {
       // Handle network errors gracefully
-      if (err.code === 'ENOTFOUND') {
+      if (err.name === 'AbortError' || err.code === 'UND_ERR_ABORTED') {
+        throw new Error(`Request timeout after ${this.timeout}ms`);
+      } else if (err.code === 'ENOTFOUND') {
         throw new Error(`DNS lookup failed for ${url}`);
       } else if (err.code === 'ECONNREFUSED') {
         throw new Error(`Connection refused to ${url}`);

package/src/lib/template.js

@@ -1,3 +1,5 @@
+import { getNestedValue } from './utils.js';
+
 // Template variable interpolation
 // Supports: {{varName}}, {{env.VAR}}, {{request-name.response.body.field}}
 
@@ -39,25 +41,4 @@ export function interpolateObject(obj, context = {}) {
   return obj;
 }
 
-function getNestedValue(obj, path) {
-  // Handle array indexing: users[0].name
-  const parts = path.split('.');
-  let current = obj;
-  
-  for (const part of parts) {
-    if (!current) return undefined;
-    
-    // Check for array indexing
-    const arrayMatch = part.match(/^(.+?)\[(\d+)\]$/);
-    if (arrayMatch) {
-      const [, key, index] = arrayMatch;
-      current = current[key];
-      if (!Array.isArray(current)) return undefined;
-      current = current[parseInt(index)];
-    } else {
-      current = current[part];
-    }
-  }
-  
-  return current;
-}
+// getNestedValue imported from utils.js

package/src/lib/utils.js

@@ -0,0 +1,25 @@
+/**
+ * Get a nested value from an object using dot notation.
+ * Supports array indexing: users[0].name
+ */
+export function getNestedValue(obj, path) {
+  const parts = path.split('.');
+  let current = obj;
+  
+  for (const part of parts) {
+    if (current === null || current === undefined) return undefined;
+    
+    // Handle array indexing
+    const arrayMatch = part.match(/^(.+?)\[(\d+)\]$/);
+    if (arrayMatch) {
+      const [, key, index] = arrayMatch;
+      current = current[key];
+      if (!Array.isArray(current)) return undefined;
+      current = current[parseInt(index)];
+    } else {
+      current = current[part];
+    }
+  }
+  
+  return current;
+}

package/src/schema.js

@@ -69,16 +69,11 @@ export function getSchema() {
             type: 'number',
             default: 30000,
             description: 'Request timeout in milliseconds'
-          },
-          '--json-output': {
-            type: 'boolean',
-            default: false,
-            description: 'Output results as structured JSON'
           }
         },
         output: {
           json: {
-            description: 'Structured response data when --json-output is used',
+            description: 'Structured response data when --output json is used',
             schema: {
               type: 'object',
               properties: {
@@ -123,9 +118,9 @@ export function getSchema() {
           1: 'Request error or 4xx/5xx status'
         },
         examples: [
-          { command: 'mpx-api get https://api.example.com/users --json-output', description: 'GET request with JSON output' },
-          { command: 'mpx-api post https://api.example.com/users -j \'{"name":"John"}\' --json-output', description: 'POST JSON data with structured output' },
-          { command: 'mpx-api get https://api.example.com/data -H "Authorization: Bearer token" --json-output', description: 'GET with custom headers' }
+          { command: 'mpx-api get https://api.example.com/users --output json', description: 'GET request with JSON output' },
+          { command: 'mpx-api post https://api.example.com/users -j \'{"name":"John"}\' --output json', description: 'POST JSON data with structured output' },
+          { command: 'mpx-api get https://api.example.com/data -H "Authorization: Bearer token"', description: 'GET with custom headers' }
         ]
       },
       collection: {
@@ -165,7 +160,7 @@ export function getSchema() {
             flags: {
               '-e, --env': { type: 'string', description: 'Environment name to use' },
               '--base-url': { type: 'string', description: 'Override base URL' },
-              '--json-output': { type: 'boolean', description: 'Output results as JSON' }
+              '--json': { type: 'boolean', description: 'Output results as JSON' }
             }
           },
           list: {
@@ -177,32 +172,24 @@ export function getSchema() {
       env: {
         description: 'Manage environments',
         subcommands: {
-          list: {
-            usage: 'mpx-api env list',
-            description: 'List all environments',
-            flags: {
-              '--json-output': { type: 'boolean', description: 'Output as JSON' }
-            }
+          init: {
+            usage: 'mpx-api env init',
+            description: 'Initialize environments directory with dev, staging, production'
           },
           set: {
-            usage: 'mpx-api env set <name> <key> <value>',
-            description: 'Set an environment variable',
+            usage: 'mpx-api env set <environment> <variable>',
+            description: 'Set an environment variable (KEY=value format)',
             arguments: {
-              name: { type: 'string', required: true, description: 'Environment name' },
-              key: { type: 'string', required: true, description: 'Variable key' },
-              value: { type: 'string', required: true, description: 'Variable value' }
+              environment: { type: 'string', required: true, description: 'Environment name' },
+              variable: { type: 'string', required: true, description: 'Variable in KEY=value format' }
             }
           },
-          get: {
-            usage: 'mpx-api env get <name> <key>',
-            description: 'Get an environment variable',
-            flags: {
-              '--json-output': { type: 'boolean', description: 'Output as JSON' }
+          list: {
+            usage: 'mpx-api env list [environment]',
+            description: 'List all environments or variables in a specific environment',
+            arguments: {
+              environment: { type: 'string', required: false, description: 'Environment name (optional)' }
             }
-          },
-          delete: {
-            usage: 'mpx-api env delete <name>',
-            description: 'Delete an environment'
           }
         }
       },
@@ -221,11 +208,11 @@ export function getSchema() {
         description: 'Run API tests',
         usage: 'mpx-api test <file> [options]',
         arguments: {
-          file: { type: 'string', required: true, description: 'Test file to run' }
+          file: { type: 'string', required: false, description: 'Test file to run (default: .mpx-api/collection.yaml)' }
         },
         flags: {
           '-e, --env': { type: 'string', description: 'Environment name' },
-          '--json-output': { type: 'boolean', description: 'Output results as JSON' }
+          '--json': { type: 'boolean', description: 'Output results as JSON' }
         }
       },
       history: {
@@ -233,7 +220,7 @@ export function getSchema() {
         usage: 'mpx-api history [options]',
         flags: {
           '-n, --limit': { type: 'number', default: 10, description: 'Number of entries to show' },
-          '--json-output': { type: 'boolean', description: 'Output as JSON' }
+          '--clear': { type: 'boolean', description: 'Clear history' }
         }
       },
       load: {
@@ -243,9 +230,10 @@ export function getSchema() {
           url: { type: 'string', required: true, description: 'Target URL' }
         },
         flags: {
-          '-c, --concurrency': { type: 'number', default: 10, description: 'Concurrent requests' },
-          '-n, --requests': { type: 'number', default: 100, description: 'Total requests' },
-          '--json-output': { type: 'boolean', description: 'Output results as JSON' }
+          '--rps': { type: 'number', default: 10, description: 'Requests per second' },
+          '-d, --duration': { type: 'number', default: 10, description: 'Test duration in seconds' },
+          '-H, --header': { type: 'array', description: 'Add request headers' },
+          '--method': { type: 'string', default: 'GET', description: 'HTTP method' }
         }
       },
       docs: {
@@ -268,12 +256,11 @@ export function getSchema() {
       }
     },
     globalFlags: {
-      '--json-output': {
-        type: 'boolean',
-        default: false,
-        description: 'Output structured JSON for machine consumption'
+      '-o, --output': {
+        type: 'string',
+        description: 'Output format: "json" for structured JSON for machine consumption'
       },
-      '--quiet': {
+      '-q, --quiet': {
         type: 'boolean',
         default: false,
         description: 'Suppress non-essential output'