@aderis-erp/cli 1.0.2 → 1.0.4

package/dist/commands/sales-orders.d.ts

@@ -33,6 +33,7 @@ export default class SalesOrders extends Command {
     private runExport;
     private runCamt053Import;
     private runNestedImport;
+    private parseFilterValue;
     private filterFields;
     private sanitizeOutput;
     private getColumns;

package/dist/commands/sales-orders.js

@@ -6,35 +6,36 @@ const HAS_IMPORT = true;
 const HAS_EXPORT = true;
 const HAS_CAMT053 = false;
 const NESTED_IMPORTS = ["line-items", "notes", "files"];
-const SUBCOMMANDS = [...["list", "create", "get", "update", "delete", "submit", "approve", "accept", "terminate", "cancel", "replace", "create-invoice", "create-line-items", "update-line-items-reorder", "update-line-items", "delete-line-items", "list-notes", "create-notes", "get-notes", "update-notes", "delete-notes", "list-files", "create-files", "get-files", "update-files", "delete-files", "files-download"], ...(HAS_IMPORT ? ['import'] : []), ...(HAS_EXPORT ? ['export'] : []), ...NESTED_IMPORTS.map(n => `import-${n}`)];
+const SUBCOMMANDS = [...["list", "create", "get", "update", "delete", "pdf", "submit", "approve", "accept", "terminate", "cancel", "replace", "create-invoice", "create-line-items", "update-line-items-reorder", "update-line-items", "delete-line-items", "list-notes", "create-notes", "get-notes", "update-notes", "delete-notes", "list-files", "create-files", "get-files", "update-files", "delete-files", "files-download"], ...(HAS_IMPORT ? ['import'] : []), ...(HAS_EXPORT ? ['export'] : []), ...NESTED_IMPORTS.map(n => `import-${n}`)];
 const ENDPOINTS = {
-    'list': { method: 'GET', path: '/v1/sales-orders', summary: 'Get all sales orders with pagination', pathParams: [], hasBody: false, isMultipart: false },
-    'create': { method: 'POST', path: '/v1/sales-orders', summary: 'Create a new sales order', pathParams: [], hasBody: true, isMultipart: false },
-    'get': { method: 'GET', path: '/v1/sales-orders/{id}', summary: 'Get a sales order by ID', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'update': { method: 'PATCH', path: '/v1/sales-orders/{id}', summary: 'Update a sales order', pathParams: ['id'], hasBody: true, isMultipart: false },
-    'delete': { method: 'DELETE', path: '/v1/sales-orders/{id}', summary: 'Delete a sales order', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'submit': { method: 'POST', path: '/v1/sales-orders/{id}/submit', summary: 'Submit order for approval (DRAFT → PENDING_APPROVAL)', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'approve': { method: 'POST', path: '/v1/sales-orders/{id}/approve', summary: 'Approve order (PENDING_APPROVAL → APPROVED). Generates order number.', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'accept': { method: 'POST', path: '/v1/sales-orders/{id}/accept', summary: 'Accept order (APPROVED → ACCEPTED). Adjusts billing start date.', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'terminate': { method: 'POST', path: '/v1/sales-orders/{id}/terminate', summary: 'Terminate order (ACCEPTED → TERMINATED). Requires billingEndDate.', pathParams: ['id'], hasBody: true, isMultipart: false },
-    'cancel': { method: 'POST', path: '/v1/sales-orders/{id}/cancel', summary: 'Cancel order (any pre-active status → CANCELLED)', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'replace': { method: 'POST', path: '/v1/sales-orders/{id}/replace', summary: 'Replace order with corrected version (APPROVED → creates new DRAFT)', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'create-invoice': { method: 'POST', path: '/v1/sales-orders/{id}/create-invoice', summary: 'Create invoice from sales order (ACCEPTED → creates DRAFT invoice)', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'create-line-items': { method: 'POST', path: '/v1/sales-orders/{orderId}/line-items', summary: 'Add a line item to a sales order', pathParams: ['orderId'], hasBody: true, isMultipart: false },
-    'update-line-items-reorder': { method: 'PATCH', path: '/v1/sales-orders/{orderId}/line-items/reorder', summary: 'Bulk reorder line items (drag-and-drop)', pathParams: ['orderId'], hasBody: true, isMultipart: false },
-    'update-line-items': { method: 'PATCH', path: '/v1/sales-orders/{orderId}/line-items/{lineItemId}', summary: 'Update a line item on a sales order', pathParams: ['orderId', 'lineItemId'], hasBody: true, isMultipart: false },
-    'delete-line-items': { method: 'DELETE', path: '/v1/sales-orders/{orderId}/line-items/{lineItemId}', summary: 'Remove a line item from a sales order', pathParams: ['orderId', 'lineItemId'], hasBody: false, isMultipart: false },
-    'list-notes': { method: 'GET', path: '/v1/sales-orders/{salesOrderId}/notes', summary: 'Get all notes for a sales order', pathParams: ['salesOrderId'], hasBody: false, isMultipart: false },
-    'create-notes': { method: 'POST', path: '/v1/sales-orders/{salesOrderId}/notes', summary: 'Create a note for a sales order', pathParams: ['salesOrderId'], hasBody: true, isMultipart: false },
-    'get-notes': { method: 'GET', path: '/v1/sales-orders/{salesOrderId}/notes/{noteId}', summary: 'Get a specific note for a sales order', pathParams: ['salesOrderId', 'noteId'], hasBody: false, isMultipart: false },
-    'update-notes': { method: 'PATCH', path: '/v1/sales-orders/{salesOrderId}/notes/{noteId}', summary: 'Update a note for a sales order', pathParams: ['salesOrderId', 'noteId'], hasBody: true, isMultipart: false },
-    'delete-notes': { method: 'DELETE', path: '/v1/sales-orders/{salesOrderId}/notes/{noteId}', summary: 'Delete a note from a sales order', pathParams: ['salesOrderId', 'noteId'], hasBody: false, isMultipart: false },
-    'list-files': { method: 'GET', path: '/v1/sales-orders/{parentId}/files', summary: 'List file attachments for a sales order', pathParams: ['parentId'], hasBody: false, isMultipart: false },
-    'create-files': { method: 'POST', path: '/v1/sales-orders/{parentId}/files', summary: 'Upload a file attachment to a sales order', pathParams: ['parentId'], hasBody: false, isMultipart: true },
-    'get-files': { method: 'GET', path: '/v1/sales-orders/{parentId}/files/{fileId}', summary: 'Get a file attachment for a sales order', pathParams: ['parentId', 'fileId'], hasBody: false, isMultipart: false },
-    'update-files': { method: 'PATCH', path: '/v1/sales-orders/{parentId}/files/{fileId}', summary: 'Update file attachment metadata for a sales order', pathParams: ['parentId', 'fileId'], hasBody: true, isMultipart: false },
-    'delete-files': { method: 'DELETE', path: '/v1/sales-orders/{parentId}/files/{fileId}', summary: 'Delete a file attachment from a sales order', pathParams: ['parentId', 'fileId'], hasBody: false, isMultipart: false },
-    'files-download': { method: 'GET', path: '/v1/sales-orders/{parentId}/files/{fileId}/download', summary: 'Download a file attachment from a sales order', pathParams: ['parentId', 'fileId'], hasBody: false, isMultipart: false },
+    'list': { method: 'GET', path: '/v1/sales-orders', summary: 'Get all sales orders with pagination', pathParams: [], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'create': { method: 'POST', path: '/v1/sales-orders', summary: 'Create a new sales order', pathParams: [], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: ['files', 'notes', 'tagIds', 'lineItems'] },
+    'get': { method: 'GET', path: '/v1/sales-orders/{id}', summary: 'Get a sales order by ID', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'update': { method: 'PATCH', path: '/v1/sales-orders/{id}', summary: 'Update a sales order', pathParams: ['id'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: ['files', 'notes', 'tagIds', 'lineItems', 'removeFileIds'] },
+    'delete': { method: 'DELETE', path: '/v1/sales-orders/{id}', summary: 'Delete a sales order', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'pdf': { method: 'GET', path: '/v1/sales-orders/{id}/pdf', summary: 'Render a sales order PDF using the configured PDF processor', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'submit': { method: 'POST', path: '/v1/sales-orders/{id}/submit', summary: 'Submit order for approval (DRAFT → PENDING_APPROVAL)', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'approve': { method: 'POST', path: '/v1/sales-orders/{id}/approve', summary: 'Approve order (PENDING_APPROVAL → APPROVED). Generates order number.', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'accept': { method: 'POST', path: '/v1/sales-orders/{id}/accept', summary: 'Accept order (APPROVED → ACCEPTED). Adjusts billing start date.', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'terminate': { method: 'POST', path: '/v1/sales-orders/{id}/terminate', summary: 'Terminate order (ACCEPTED → TERMINATED). Requires billingEndDate.', pathParams: ['id'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'cancel': { method: 'POST', path: '/v1/sales-orders/{id}/cancel', summary: 'Cancel order (any pre-active status → CANCELLED)', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'replace': { method: 'POST', path: '/v1/sales-orders/{id}/replace', summary: 'Replace order with corrected version (APPROVED → creates new DRAFT)', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'create-invoice': { method: 'POST', path: '/v1/sales-orders/{id}/create-invoice', summary: 'Create invoice from sales order (ACCEPTED → creates DRAFT invoice)', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'create-line-items': { method: 'POST', path: '/v1/sales-orders/{orderId}/line-items', summary: 'Add a line item to a sales order', pathParams: ['orderId'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'update-line-items-reorder': { method: 'PATCH', path: '/v1/sales-orders/{orderId}/line-items/reorder', summary: 'Bulk reorder line items (drag-and-drop)', pathParams: ['orderId'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: ['items'] },
+    'update-line-items': { method: 'PATCH', path: '/v1/sales-orders/{orderId}/line-items/{lineItemId}', summary: 'Update a line item on a sales order', pathParams: ['orderId', 'lineItemId'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'delete-line-items': { method: 'DELETE', path: '/v1/sales-orders/{orderId}/line-items/{lineItemId}', summary: 'Remove a line item from a sales order', pathParams: ['orderId', 'lineItemId'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'list-notes': { method: 'GET', path: '/v1/sales-orders/{salesOrderId}/notes', summary: 'Get all notes for a sales order', pathParams: ['salesOrderId'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'create-notes': { method: 'POST', path: '/v1/sales-orders/{salesOrderId}/notes', summary: 'Create a note for a sales order', pathParams: ['salesOrderId'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'get-notes': { method: 'GET', path: '/v1/sales-orders/{salesOrderId}/notes/{noteId}', summary: 'Get a specific note for a sales order', pathParams: ['salesOrderId', 'noteId'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'update-notes': { method: 'PATCH', path: '/v1/sales-orders/{salesOrderId}/notes/{noteId}', summary: 'Update a note for a sales order', pathParams: ['salesOrderId', 'noteId'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'delete-notes': { method: 'DELETE', path: '/v1/sales-orders/{salesOrderId}/notes/{noteId}', summary: 'Delete a note from a sales order', pathParams: ['salesOrderId', 'noteId'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'list-files': { method: 'GET', path: '/v1/sales-orders/{parentId}/files', summary: 'List file attachments for a sales order', pathParams: ['parentId'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'create-files': { method: 'POST', path: '/v1/sales-orders/{parentId}/files', summary: 'Upload a file attachment to a sales order', pathParams: ['parentId'], hasBody: false, isMultipart: true, isBinaryResponse: false, bodyArrayFields: [] },
+    'get-files': { method: 'GET', path: '/v1/sales-orders/{parentId}/files/{fileId}', summary: 'Get a file attachment for a sales order', pathParams: ['parentId', 'fileId'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'update-files': { method: 'PATCH', path: '/v1/sales-orders/{parentId}/files/{fileId}', summary: 'Update file attachment metadata for a sales order', pathParams: ['parentId', 'fileId'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'delete-files': { method: 'DELETE', path: '/v1/sales-orders/{parentId}/files/{fileId}', summary: 'Delete a file attachment from a sales order', pathParams: ['parentId', 'fileId'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'files-download': { method: 'GET', path: '/v1/sales-orders/{parentId}/files/{fileId}/download', summary: 'Download a file attachment from a sales order', pathParams: ['parentId', 'fileId'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
 };
 export default class SalesOrders extends Command {
     static description = 'Manage sales orders';
@@ -155,15 +156,7 @@ export default class SalesOrders extends Command {
                 if (eqIndex === -1)
                     this.error(`Invalid --filter format: ${f}. Use: --filter key=value`);
                 const key = f.slice(0, eqIndex);
-                let value = f.slice(eqIndex + 1);
-                // Check for operator prefix (with or without $)
-                const opMatch = value.match(/^\$?(eq|ne|in|like|gt|gte|lt|lte|null):/);
-                if (opMatch) {
-                    value = `\$${opMatch[1]}:${value.slice(opMatch[0].length)}`;
-                }
-                else {
-                    value = `\$eq:${value}`;
-                }
+                const value = this.parseFilterValue(f.slice(eqIndex + 1));
                 const filterKey = `filter.${key}`;
                 if (filterKey in queryParams) {
                     // Multiple filters on same field: collect as array
@@ -196,7 +189,9 @@ export default class SalesOrders extends Command {
             data = form;
         }
         else if (endpoint.hasBody) {
-            if (flags.file) {
+            // For binary-response endpoints, --file is the output path, not a JSON
+            // input file — skip the read-as-body branch.
+            if (flags.file && !endpoint.isBinaryResponse) {
                 const fsModule = await import('node:fs');
                 try {
                     data = JSON.parse(fsModule.readFileSync(flags.file, 'utf-8'));
@@ -218,6 +213,7 @@ export default class SalesOrders extends Command {
                 if (!data)
                     data = {};
                 const body = data;
+                const arrayFields = new Set(endpoint.bodyArrayFields);
                 for (const pair of flags.set) {
                     const eqIndex = pair.indexOf('=');
                     if (eqIndex === -1)
@@ -229,6 +225,19 @@ export default class SalesOrders extends Command {
                         value = JSON.parse(value);
                     }
                     catch { /* keep as string */ }
+                    // For top-level keys typed as array in the API schema, split bare
+                    // comma-separated input (e.g. "1171,1170" -> ["1171","1170"]) and
+                    // wrap a lone scalar in a single-element array. Skips when --set
+                    // already provided a JSON array.
+                    const isArrayField = !key.includes('.') && arrayFields.has(key);
+                    if (isArrayField && !Array.isArray(value)) {
+                        if (typeof value === 'string') {
+                            value = value.split(',').map(v => v.trim()).filter(v => v.length > 0);
+                        }
+                        else if (value !== undefined && value !== null) {
+                            value = [value];
+                        }
+                    }
                     // Support nested keys like "address.city"
                     const keys = key.split('.');
                     if (keys.some(k => k === '__proto__' || k === 'constructor' || k === 'prototype')) {
@@ -279,6 +288,26 @@ export default class SalesOrders extends Command {
             process.stderr.write('\n');
         }
         try {
+            // Binary response: download to file
+            if (endpoint.isBinaryResponse) {
+                if (!flags.file) {
+                    this.error(`Endpoint returns a binary file. Specify the output path with -f / --file (e.g. -f report.xlsx).`);
+                }
+                const binResponse = await apiRequest(endpoint.method, apiPath, {
+                    params: Object.keys(queryParams).length > 0 ? queryParams : undefined,
+                    data,
+                    contextName: flags.context,
+                    binary: true,
+                });
+                const fsModule = await import('node:fs');
+                const binData = binResponse.data;
+                const buffer = Buffer.isBuffer(binData)
+                    ? binData
+                    : Buffer.from(binData);
+                fsModule.writeFileSync(flags.file, buffer);
+                this.log(`Saved ${buffer.length} bytes to ${flags.file}`);
+                return;
+            }
             const response = await apiRequest(endpoint.method, apiPath, {
                 params: Object.keys(queryParams).length > 0 ? queryParams : undefined,
                 data,
@@ -369,6 +398,7 @@ export default class SalesOrders extends Command {
         }
         else if (flags.set && flags.set.length > 0) {
             const item = {};
+            const arrayFields = new Set(ENDPOINTS['create']?.bodyArrayFields ?? []);
             for (const pair of flags.set) {
                 const eqIndex = pair.indexOf('=');
                 if (eqIndex === -1)
@@ -379,6 +409,15 @@ export default class SalesOrders extends Command {
                     value = JSON.parse(value);
                 }
                 catch { /* keep as string */ }
+                const isArrayField = !key.includes('.') && arrayFields.has(key);
+                if (isArrayField && !Array.isArray(value)) {
+                    if (typeof value === 'string') {
+                        value = value.split(',').map(v => v.trim()).filter(v => v.length > 0);
+                    }
+                    else if (value !== undefined && value !== null) {
+                        value = [value];
+                    }
+                }
                 const keys = key.split('.');
                 if (keys.some(k => k === '__proto__' || k === 'constructor' || k === 'prototype')) {
                     this.error(`Invalid --set key: ${key}`);
@@ -528,14 +567,7 @@ export default class SalesOrders extends Command {
                 if (eqIndex === -1)
                     this.error(`Invalid --filter format: ${f}. Use: --filter key=value`);
                 const key = f.slice(0, eqIndex);
-                let value = f.slice(eqIndex + 1);
-                const opMatch = value.match(/^\$?(eq|ne|in|like|gt|gte|lt|lte|null):/);
-                if (opMatch) {
-                    value = `\$${opMatch[1]}:${value.slice(opMatch[0].length)}`;
-                }
-                else {
-                    value = `\$eq:${value}`;
-                }
+                const value = this.parseFilterValue(f.slice(eqIndex + 1));
                 const filterKey = `filter.${key}`;
                 if (filterKey in baseParams) {
                     const existing = baseParams[filterKey];
@@ -712,6 +744,7 @@ export default class SalesOrders extends Command {
         }
         else if (flags.set && flags.set.length > 0) {
             const item = {};
+            const arrayFields = new Set(ENDPOINTS[`create-${suffix}`]?.bodyArrayFields ?? []);
             for (const pair of flags.set) {
                 const eqIndex = pair.indexOf('=');
                 if (eqIndex === -1)
@@ -722,6 +755,15 @@ export default class SalesOrders extends Command {
                     value = JSON.parse(value);
                 }
                 catch { /* keep as string */ }
+                const isArrayField = !key.includes('.') && arrayFields.has(key);
+                if (isArrayField && !Array.isArray(value)) {
+                    if (typeof value === 'string') {
+                        value = value.split(',').map(v => v.trim()).filter(v => v.length > 0);
+                    }
+                    else if (value !== undefined && value !== null) {
+                        value = [value];
+                    }
+                }
                 const keys = key.split('.');
                 if (keys.some(k => k === '__proto__' || k === 'constructor' || k === 'prototype')) {
                     this.error(`Invalid --set key: ${key}`);
@@ -841,35 +883,62 @@ export default class SalesOrders extends Command {
         this.log('');
         this.log(`Summary: ${created} created, ${updated} updated, ${errors.length} failed`);
     }
+    parseFilterValue(value) {
+        // Recognises the nestjs-paginate operator set (with or without the leading $)
+        // and recursively unwraps chained operators like 'not:null' -> '$not:$null'
+        // or 'not:like:John' -> '$not:$like:John'. Falls back to '$eq:<value>' when
+        // no operator prefix is present.
+        const opRe = /^\$?(and|or|not|eq|gt|gte|in|null|lt|lte|btw|ne|ilike|like|sw|contains)(?::|$)/;
+        const m = value.match(opRe);
+        if (!m)
+            return `\$eq:${value}`;
+        const op = m[1];
+        const rest = value.slice(m[0].length);
+        if (rest === '')
+            return `\$${op}`;
+        return opRe.test(rest) ? `\$${op}:${this.parseFilterValue(rest)}` : `\$${op}:${rest}`;
+    }
     filterFields(data, fields) {
         const isUnsafeKey = (k) => k === '__proto__' || k === 'constructor' || k === 'prototype';
         const pick = (obj, keys) => {
-            const result = {};
+            // Group keys by their first segment so sibling sub-paths
+            // (e.g. 'items.amount' + 'items._type') resolve in one recursive pass
+            // and don't clobber each other on merge.
+            const directKeys = new Set();
+            const nestedKeys = new Map();
             for (const key of keys) {
                 if (key.split('.').some(isUnsafeKey))
                     continue;
                 if (key.includes('.')) {
-                    // Handle nested fields like 'customer.name' or 'allocations.salesInvoiceId'
                     const [first, ...rest] = key.split('.');
-                    const val = obj[first];
-                    if (val && typeof val === 'object') {
-                        const restKey = rest.join('.');
-                        if (Array.isArray(val)) {
-                            // Map over array elements (e.g., allocations[].salesInvoiceId)
-                            const existing = Array.isArray(result[first]) ? result[first] : [];
-                            result[first] = val.map((item, i) => ({
-                                ...(existing[i] || {}),
-                                ...pick(item, [restKey]),
-                            }));
-                        }
-                        else {
-                            const nested = pick(val, [restKey]);
-                            result[first] = { ...(result[first] || {}), ...nested };
-                        }
+                    if (isUnsafeKey(first))
+                        continue;
+                    const list = nestedKeys.get(first);
+                    if (list) {
+                        list.push(rest.join('.'));
+                    }
+                    else {
+                        nestedKeys.set(first, [rest.join('.')]);
                     }
                 }
-                else if (key in obj) {
+                else {
+                    directKeys.add(key);
+                }
+            }
+            const result = {};
+            for (const key of directKeys) {
+                if (key in obj)
                     result[key] = obj[key];
+            }
+            for (const [first, restKeys] of nestedKeys) {
+                const val = obj[first];
+                if (!val || typeof val !== 'object')
+                    continue;
+                if (Array.isArray(val)) {
+                    result[first] = val.map(item => pick(item, restKeys));
+                }
+                else {
+                    result[first] = pick(val, restKeys);
                 }
             }
             return result;

package/dist/commands/switch.d.ts

@@ -3,4 +3,5 @@ export default class Switch extends Command {
     static description: string;
     static examples: string[];
     run(): Promise<void>;
+    private handleSessionExpired;
 }

package/dist/commands/switch.js

@@ -1,6 +1,7 @@
-import { select } from '@inquirer/prompts';
+import { confirm, select } from '@inquirer/prompts';
 import { Command } from '@oclif/core';
-import { getCurrentContext, listContexts, setCurrentContext } from '../lib/config.js';
+import { loginAndSwitchTenant } from '../lib/auth.js';
+import { getContext, getCurrentContext, listContexts, setCurrentContext } from '../lib/config.js';
 export default class Switch extends Command {
     static description = 'Switch context and tenant interactively';
     static examples = ['<%= config.bin %> switch'];
@@ -34,8 +35,62 @@ export default class Switch extends Command {
             setCurrentContext(selectedContext);
             this.log(`Switched to context: ${selectedContext}`);
         }
-        // Step 2: Select tenant within chosen context
+        // Step 2: Select tenant within chosen context.
+        // If the session is expired, prompt the user to re-login and then retry.
         const { default: AuthTenant } = await import('./auth/tenant.js');
+        try {
+            await AuthTenant.run([`--context=${selectedContext}`]);
+        }
+        catch (error) {
+            if (!isSessionExpired(error))
+                throw error;
+            await this.handleSessionExpired(selectedContext);
+        }
+    }
+    async handleSessionExpired(selectedContext) {
+        const shouldLogin = await confirm({
+            default: true,
+            message: 'Session expired. Do you want to login again?',
+        });
+        if (!shouldLogin)
+            return;
+        // If we have a cached tenant list from a previous session, let the user pick
+        // tenant FIRST. Then run the combined login + tenant-switch flow which uses
+        // a single browser tab (chained PKCE rounds with a meta-refresh redirect).
+        const ctx = getContext(selectedContext);
+        const cached = ctx?.cachedTenants ?? [];
+        if (cached.length > 1) {
+            const sorted = [...cached].sort((a, b) => {
+                if (a.tenantId === ctx?.tenant_id)
+                    return -1;
+                if (b.tenantId === ctx?.tenant_id)
+                    return 1;
+                return a.name.localeCompare(b.name);
+            });
+            const selectedTenant = await select({
+                choices: sorted.map((t) => ({
+                    name: t.tenantId === ctx?.tenant_id ? `${t.name}  (previous)` : t.name,
+                    value: t.tenantId,
+                })),
+                message: 'Select a tenant:',
+            });
+            const selectedName = cached.find((t) => t.tenantId === selectedTenant)?.name;
+            this.log(`Logging in and switching to ${selectedName ?? selectedTenant}…`);
+            if (ctx) {
+                await loginAndSwitchTenant(ctx, selectedTenant);
+            }
+            this.log(`Successfully switched to tenant ${selectedName ? `${selectedName} (${selectedTenant})` : selectedTenant}`);
+            return;
+        }
+        // No cached tenant list (or only one tenant) — fall back to the two-step
+        // flow: login first, then run the normal tenant selector.
+        const { default: AuthLogin } = await import('./auth/login.js');
+        const { default: AuthTenant } = await import('./auth/tenant.js');
+        await AuthLogin.run([`--context=${selectedContext}`]);
         await AuthTenant.run([`--context=${selectedContext}`]);
     }
 }
+function isSessionExpired(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return /session expired/i.test(message) || /not logged in/i.test(message);
+}

package/dist/commands/{processing-logs.d.ts → tags 3.d.ts }

@@ -1,5 +1,5 @@
 import { Command } from '@oclif/core';
-export default class ProcessingLogs extends Command {
+export default class Tags extends Command {
     static description: string;
     static examples: string[];
     static args: {
@@ -30,6 +30,7 @@ export default class ProcessingLogs extends Command {
     private runExport;
     private runCamt053Import;
     private runNestedImport;
+    private parseFilterValue;
     private filterFields;
     private sanitizeOutput;
     private getColumns;