@aderis-erp/cli 1.0.2 → 1.0.4

package/dist/commands/tax-codes.d.ts

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

package/dist/commands/tax-codes.js

@@ -8,14 +8,14 @@ const HAS_CAMT053 = false;
 const NESTED_IMPORTS = [];
 const SUBCOMMANDS = [...["list", "create", "tax-codes-standard-rate", "get-by-country-rate", "get-by-code-at-date", "get", "update", "delete"], ...(HAS_IMPORT ? ['import'] : []), ...(HAS_EXPORT ? ['export'] : []), ...NESTED_IMPORTS.map(n => `import-${n}`)];
 const ENDPOINTS = {
-    'list': { method: 'GET', path: '/v1/tax/tax-codes', summary: 'Get all tax codes with pagination', pathParams: [], hasBody: false, isMultipart: false },
-    'create': { method: 'POST', path: '/v1/tax/tax-codes', summary: 'Create a new tax code', pathParams: [], hasBody: true, isMultipart: false },
-    'tax-codes-standard-rate': { method: 'GET', path: '/v1/tax/tax-codes/standard-rate', summary: 'Get the standard-rate tax code for a country at a specific date', pathParams: [], hasBody: false, isMultipart: false },
-    'get-by-country-rate': { method: 'GET', path: '/v1/tax/tax-codes/by-country-rate', summary: 'Get tax code by country and rate at a specific date', pathParams: [], hasBody: false, isMultipart: false },
-    'get-by-code-at-date': { method: 'GET', path: '/v1/tax/tax-codes/by-code-at-date', summary: 'Get tax code by code at a specific date', pathParams: [], hasBody: false, isMultipart: false },
-    'get': { method: 'GET', path: '/v1/tax/tax-codes/{id}', summary: 'Get a tax code by ID', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'update': { method: 'PATCH', path: '/v1/tax/tax-codes/{id}', summary: 'Update a tax code', pathParams: ['id'], hasBody: true, isMultipart: false },
-    'delete': { method: 'DELETE', path: '/v1/tax/tax-codes/{id}', summary: 'Delete a tax code', pathParams: ['id'], hasBody: false, isMultipart: false },
+    'list': { method: 'GET', path: '/v1/tax/tax-codes', summary: 'Get all tax codes with pagination', pathParams: [], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'create': { method: 'POST', path: '/v1/tax/tax-codes', summary: 'Create a new tax code', pathParams: [], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'tax-codes-standard-rate': { method: 'GET', path: '/v1/tax/tax-codes/standard-rate', summary: 'Get the standard-rate tax code for a country at a specific date', pathParams: [], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'get-by-country-rate': { method: 'GET', path: '/v1/tax/tax-codes/by-country-rate', summary: 'Get tax code by country and rate at a specific date', pathParams: [], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'get-by-code-at-date': { method: 'GET', path: '/v1/tax/tax-codes/by-code-at-date', summary: 'Get tax code by code at a specific date', pathParams: [], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'get': { method: 'GET', path: '/v1/tax/tax-codes/{id}', summary: 'Get a tax code by ID', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'update': { method: 'PATCH', path: '/v1/tax/tax-codes/{id}', summary: 'Update a tax code', pathParams: ['id'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'delete': { method: 'DELETE', path: '/v1/tax/tax-codes/{id}', summary: 'Delete a tax code', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
 };
 export default class TaxCodes extends Command {
     static description = 'Manage tax codes';
@@ -133,15 +133,7 @@ export default class TaxCodes 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
@@ -174,7 +166,9 @@ export default class TaxCodes 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'));
@@ -196,6 +190,7 @@ export default class TaxCodes 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)
@@ -207,6 +202,19 @@ export default class TaxCodes 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')) {
@@ -257,6 +265,26 @@ export default class TaxCodes 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,
@@ -347,6 +375,7 @@ export default class TaxCodes 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)
@@ -357,6 +386,15 @@ export default class TaxCodes 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}`);
@@ -506,14 +544,7 @@ export default class TaxCodes 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];
@@ -690,6 +721,7 @@ export default class TaxCodes 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)
@@ -700,6 +732,15 @@ export default class TaxCodes 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}`);
@@ -819,35 +860,62 @@ export default class TaxCodes 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/tax-matrix.d.ts

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

package/dist/commands/tax-matrix.js

@@ -8,11 +8,11 @@ const HAS_CAMT053 = false;
 const NESTED_IMPORTS = [];
 const SUBCOMMANDS = [...["list", "create", "get", "update", "delete"], ...(HAS_IMPORT ? ['import'] : []), ...(HAS_EXPORT ? ['export'] : []), ...NESTED_IMPORTS.map(n => `import-${n}`)];
 const ENDPOINTS = {
-    'list': { method: 'GET', path: '/v1/tax/tax-matrix', summary: 'Get all tax matrix mappings with pagination', pathParams: [], hasBody: false, isMultipart: false },
-    'create': { method: 'POST', path: '/v1/tax/tax-matrix', summary: 'Create a new tax matrix mapping', pathParams: [], hasBody: true, isMultipart: false },
-    'get': { method: 'GET', path: '/v1/tax/tax-matrix/{id}', summary: 'Get a tax matrix mapping by ID', pathParams: ['id'], hasBody: false, isMultipart: false },
-    'update': { method: 'PATCH', path: '/v1/tax/tax-matrix/{id}', summary: 'Update a tax matrix mapping', pathParams: ['id'], hasBody: true, isMultipart: false },
-    'delete': { method: 'DELETE', path: '/v1/tax/tax-matrix/{id}', summary: 'Delete a tax matrix mapping', pathParams: ['id'], hasBody: false, isMultipart: false },
+    'list': { method: 'GET', path: '/v1/tax/tax-matrix', summary: 'Get all tax matrix mappings with pagination', pathParams: [], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'create': { method: 'POST', path: '/v1/tax/tax-matrix', summary: 'Create a new tax matrix mapping', pathParams: [], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'get': { method: 'GET', path: '/v1/tax/tax-matrix/{id}', summary: 'Get a tax matrix mapping by ID', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'update': { method: 'PATCH', path: '/v1/tax/tax-matrix/{id}', summary: 'Update a tax matrix mapping', pathParams: ['id'], hasBody: true, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
+    'delete': { method: 'DELETE', path: '/v1/tax/tax-matrix/{id}', summary: 'Delete a tax matrix mapping', pathParams: ['id'], hasBody: false, isMultipart: false, isBinaryResponse: false, bodyArrayFields: [] },
 };
 export default class TaxMatrix extends Command {
     static description = 'Manage tax matrix';
@@ -130,15 +130,7 @@ export default class TaxMatrix 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
@@ -171,7 +163,9 @@ export default class TaxMatrix 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'));
@@ -193,6 +187,7 @@ export default class TaxMatrix 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)
@@ -204,6 +199,19 @@ export default class TaxMatrix 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')) {
@@ -254,6 +262,26 @@ export default class TaxMatrix 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,
@@ -344,6 +372,7 @@ export default class TaxMatrix 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)
@@ -354,6 +383,15 @@ export default class TaxMatrix 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}`);
@@ -503,14 +541,7 @@ export default class TaxMatrix 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];
@@ -687,6 +718,7 @@ export default class TaxMatrix 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)
@@ -697,6 +729,15 @@ export default class TaxMatrix 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}`);
@@ -816,35 +857,62 @@ export default class TaxMatrix 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/tenants.d.ts

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