@myapihq/cli 1.0.7 → 1.0.8

package/dist/commands/billing.js

@@ -21,25 +21,45 @@ async function balance(flags) {
 }
 async function history(flags) {
     if (flags.help) {
-        (0, output_js_1.info)('Usage: myapi billing history\n\nShows your recent billing transactions and top-ups.');
+        (0, output_js_1.info)('Usage: myapi billing history [--json]\n\nShows your recent billing transactions and top-ups.');
         return;
     }
     const config = (0, config_js_1.requireConfig)();
     const items = await sdk_1.hq.getBillingHistory(config.api_key);
-    (0, output_js_1.printTable)(items);
+    if (flags.json) {
+        (0, output_js_1.printJson)(items);
+        return;
+    }
+    const formattedItems = items.map(item => {
+        // Attempt to parse the date cleanly (handling Go's "+0000 UTC" suffix)
+        const cleanDate = item.created_at.replace(' +0000 UTC', 'Z');
+        const date = new Date(cleanDate);
+        const dateStr = isNaN(date.getTime()) ? item.created_at : date.toLocaleString();
+        // Format amount
+        const isNegative = item.amount_cents < 0;
+        const absAmount = Math.abs(item.amount_cents) / 100;
+        const amountStr = `${isNegative ? '-' : ''}$${absAmount.toFixed(2)}`;
+        return {
+            Type: item.type || 'unknown',
+            Amount: amountStr,
+            Status: item.status ? item.status.charAt(0).toUpperCase() + item.status.slice(1) : '',
+            Date: dateStr
+        };
+    });
+    (0, output_js_1.printTable)(formattedItems);
 }
 async function topup(amountStr, flags) {
     if (flags.help) {
-        (0, output_js_1.info)('Usage: myapi billing topup <amount>\n\nAdds funds to your account balance using your saved payment method.\nExample: myapi billing topup 10.00');
+        (0, output_js_1.info)('Usage: myapi billing topup <amount_in_dollars>\n\nAdds funds to your account balance using your saved payment method.\nExample: myapi billing topup 10.00');
         return;
     }
     if (!amountStr) {
-        (0, output_js_1.error)("Missing amount. Usage: myapi billing topup <amount>");
+        (0, output_js_1.error)("Missing amount. Usage: myapi billing topup <amount_in_dollars>");
         return;
     }
     const amount = parseFloat(amountStr);
     if (isNaN(amount)) {
-        (0, output_js_1.error)("Invalid amount. Must be a number (e.g., 10.00)");
+        (0, output_js_1.error)("Invalid amount. Must be a number in dollars (e.g., 10.00)");
         return;
     }
     const config = (0, config_js_1.requireConfig)();

package/dist/commands/keys.js

@@ -63,7 +63,25 @@ async function list(flags) {
     }
     const config = (0, config_js_1.requireConfig)();
     const keysList = await sdk_1.hq.listApiKeys(config.api_key);
-    (0, output_js_1.printTable)(keysList);
+    const formattedKeys = keysList.map(k => {
+        // Format creation date
+        const createdDate = new Date(k.created_at);
+        const createdStr = isNaN(createdDate.getTime()) ? k.created_at : createdDate.toLocaleString();
+        // Format last used date
+        let lastUsedStr = 'Never';
+        if (k.last_used_at) {
+            const lastUsedDate = new Date(k.last_used_at);
+            lastUsedStr = isNaN(lastUsedDate.getTime()) ? k.last_used_at : lastUsedDate.toLocaleString();
+        }
+        return {
+            Name: k.name || 'Unnamed',
+            Prefix: k.prefix,
+            ID: k.id,
+            'Created At': createdStr,
+            'Last Used': lastUsedStr
+        };
+    });
+    (0, output_js_1.printTable)(formattedKeys);
 }
 async function revoke(id, flags) {
     if (flags.help) {

package/dist/commands/org.d.ts

@@ -2,4 +2,4 @@ export declare function create(flags: Record<string, string | boolean>): Promise
 export declare function list(flags: Record<string, string | boolean>): Promise<void>;
 export declare function get(id: string, flags: Record<string, string | boolean>): Promise<void>;
 export declare function del(id: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function importOrg(domain: string, flags: Record<string, string | boolean>): Promise<void>;
+export declare function importOrg(args: string[], flags: Record<string, string | boolean>): Promise<void>;

package/dist/commands/org.js

@@ -33,12 +33,12 @@ async function create(flags) {
 }
 async function list(flags) {
     if (flags.help) {
-        (0, output_js_1.info)('Usage: myapi org list\n\nLists all organizations in your account.');
+        (0, output_js_1.info)('Usage: myapi org list\n\nLists all organizations in your account as JSON.');
         return;
     }
     const config = (0, config_js_1.requireConfig)();
     const orgs = await sdk_1.hq.listOrgs(config.api_key);
-    (0, output_js_1.printTable)(orgs);
+    (0, output_js_1.printJson)(orgs);
 }
 async function get(id, flags) {
     if (flags.help) {
@@ -66,17 +66,19 @@ async function del(id, flags) {
     await sdk_1.hq.deleteOrg(config.api_key, id);
     (0, output_js_1.success)(`Org ${id} deleted`);
 }
-async function importOrg(domain, flags) {
+async function importOrg(args, flags) {
     if (flags.help) {
-        (0, output_js_1.info)('Usage: myapi org import <domain>\n\nAutomatically extracts brand info from an existing website and creates an organization.');
+        (0, output_js_1.info)('Usage: myapi org import <org_id> <domain>\n\nAutomatically extracts brand info from an existing website and updates the organization.\n\nNote: You must create a placeholder organization first using `myapi org create` to get an org_id.');
         return;
     }
-    if (!domain) {
-        (0, output_js_1.error)("Missing domain. Usage: myapi org import <domain>");
+    const orgId = args[0];
+    const domain = args[1];
+    if (!orgId || !domain) {
+        (0, output_js_1.error)("Missing arguments. Usage: myapi org import <org_id> <domain>");
         return;
     }
     const config = (0, config_js_1.requireConfig)();
-    const result = await sdk_1.hq.importOrg(config.api_key, domain);
+    const result = await sdk_1.hq.importOrg(config.api_key, orgId, domain);
     const importId = result.job_id;
     process.stdout.write("Importing ");
     const chars = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

package/dist/index.js

@@ -86,7 +86,7 @@ async function main() {
                 else if (subcommand === 'delete')
                     await orgCmd.del(restArgs[0], flags);
                 else if (subcommand === 'import')
-                    await orgCmd.importOrg(restArgs[0], flags);
+                    await orgCmd.importOrg(restArgs, flags);
                 else
                     printHelp();
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myapihq/cli",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "MyAPI command-line interface",
   "main": "dist/index.js",
   "bin": {

package/src/commands/billing.ts

@@ -1,6 +1,6 @@
 import { hq } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
-import { success, error, printTable, info } from '../output.js';
+import { success, error, printTable, info, printJson } from '../output.js';
 
 export async function balance(flags: Record<string, string | boolean>) {
   if (flags.help) {
@@ -19,26 +19,51 @@ export async function balance(flags: Record<string, string | boolean>) {
 
 export async function history(flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi billing history\n\nShows your recent billing transactions and top-ups.');
+    info('Usage: myapi billing history [--json]\n\nShows your recent billing transactions and top-ups.');
     return;
   }
   const config = requireConfig();
   const items = await hq.getBillingHistory(config.api_key);
-  printTable(items as unknown as Record<string, unknown>[]);
+  
+  if (flags.json) {
+    printJson(items);
+    return;
+  }
+  
+  const formattedItems = items.map(item => {
+    // Attempt to parse the date cleanly (handling Go's "+0000 UTC" suffix)
+    const cleanDate = item.created_at.replace(' +0000 UTC', 'Z');
+    const date = new Date(cleanDate);
+    const dateStr = isNaN(date.getTime()) ? item.created_at : date.toLocaleString();
+    
+    // Format amount
+    const isNegative = item.amount_cents < 0;
+    const absAmount = Math.abs(item.amount_cents) / 100;
+    const amountStr = `${isNegative ? '-' : ''}$${absAmount.toFixed(2)}`;
+    
+    return {
+      Type: item.type || 'unknown',
+      Amount: amountStr,
+      Status: item.status ? item.status.charAt(0).toUpperCase() + item.status.slice(1) : '',
+      Date: dateStr
+    };
+  });
+  
+  printTable(formattedItems as unknown as Record<string, unknown>[]);
 }
 
 export async function topup(amountStr: string, flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi billing topup <amount>\n\nAdds funds to your account balance using your saved payment method.\nExample: myapi billing topup 10.00');
+    info('Usage: myapi billing topup <amount_in_dollars>\n\nAdds funds to your account balance using your saved payment method.\nExample: myapi billing topup 10.00');
     return;
   }
   if (!amountStr) {
-    error("Missing amount. Usage: myapi billing topup <amount>");
+    error("Missing amount. Usage: myapi billing topup <amount_in_dollars>");
     return;
   }
   const amount = parseFloat(amountStr);
   if (isNaN(amount)) {
-    error("Invalid amount. Must be a number (e.g., 10.00)");
+    error("Invalid amount. Must be a number in dollars (e.g., 10.00)");
     return;
   }
   

package/src/commands/keys.ts

@@ -29,7 +29,29 @@ export async function list(flags: Record<string, string | boolean>) {
   }
   const config = requireConfig();
   const keysList = await hq.listApiKeys(config.api_key);
-  printTable(keysList as unknown as Record<string, unknown>[]);
+  
+  const formattedKeys = keysList.map(k => {
+    // Format creation date
+    const createdDate = new Date(k.created_at);
+    const createdStr = isNaN(createdDate.getTime()) ? k.created_at : createdDate.toLocaleString();
+    
+    // Format last used date
+    let lastUsedStr = 'Never';
+    if (k.last_used_at) {
+      const lastUsedDate = new Date(k.last_used_at);
+      lastUsedStr = isNaN(lastUsedDate.getTime()) ? k.last_used_at : lastUsedDate.toLocaleString();
+    }
+    
+    return {
+      Name: k.name || 'Unnamed',
+      Prefix: k.prefix,
+      ID: k.id,
+      'Created At': createdStr,
+      'Last Used': lastUsedStr
+    };
+  });
+  
+  printTable(formattedKeys as unknown as Record<string, unknown>[]);
 }
 
 export async function revoke(id: string, flags: Record<string, string | boolean>) {

package/src/commands/org.ts

@@ -25,12 +25,12 @@ export async function create(flags: Record<string, string | boolean>) {
 
 export async function list(flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi org list\n\nLists all organizations in your account.');
+    info('Usage: myapi org list\n\nLists all organizations in your account as JSON.');
     return;
   }
   const config = requireConfig();
   const orgs = await hq.listOrgs(config.api_key);
-  printTable(orgs as unknown as Record<string, unknown>[]);
+  printJson(orgs);
 }
 
 export async function get(id: string, flags: Record<string, string | boolean>) {
@@ -61,18 +61,21 @@ export async function del(id: string, flags: Record<string, string | boolean>) {
   success(`Org ${id} deleted`);
 }
 
-export async function importOrg(domain: string, flags: Record<string, string | boolean>) {
+export async function importOrg(args: string[], flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi org import <domain>\n\nAutomatically extracts brand info from an existing website and creates an organization.');
+    info('Usage: myapi org import <org_id> <domain>\n\nAutomatically extracts brand info from an existing website and updates the organization.\n\nNote: You must create a placeholder organization first using `myapi org create` to get an org_id.');
     return;
   }
-  if (!domain) {
-    error("Missing domain. Usage: myapi org import <domain>");
+  const orgId = args[0];
+  const domain = args[1];
+  
+  if (!orgId || !domain) {
+    error("Missing arguments. Usage: myapi org import <org_id> <domain>");
     return;
   }
   const config = requireConfig();
   
-  const result = await hq.importOrg(config.api_key, domain);
+  const result = await hq.importOrg(config.api_key, orgId, domain);
   const importId = result.job_id;
   
   process.stdout.write("Importing ");

package/src/index.ts

@@ -40,7 +40,7 @@ async function main() {
         else if (subcommand === 'create') await orgCmd.create(flags);
         else if (subcommand === 'get') await orgCmd.get(restArgs[0], flags);
         else if (subcommand === 'delete') await orgCmd.del(restArgs[0], flags);
-        else if (subcommand === 'import') await orgCmd.importOrg(restArgs[0], flags);
+        else if (subcommand === 'import') await orgCmd.importOrg(restArgs, flags);
         else printHelp();
         break;
       case 'billing':