@aderis-erp/cli 1.0.9 → 1.0.11

package/dist/commands/webhooks.js

@@ -433,76 +433,126 @@ export default class Webhooks extends Command {
             return '';
         };
         const results = [];
-        for (const item of items) {
+        // Stream output row-by-row so progress is visible during long imports.
+        // Pre-compute the identifier column width from the input items so the
+        // table stays aligned without buffering all rows.
+        // When stdout is piped (IDE terminals, tee, CI), Node switches to async-buffered
+        // mode and rows accumulate in the pipe buffer until it fills. Force blocking
+        // mode so each \n-terminated write flushes immediately.
+        const stdoutHandle = process.stdout._handle;
+        if (stdoutHandle?.setBlocking)
+            stdoutHandle.setBlocking(true);
+        const outputFormat = flags.output || 'table';
+        const useCsv = outputFormat === 'csv' || Boolean(flags.csv);
+        const useJson = outputFormat === 'json';
+        const statusWidth = 8;
+        const identifierWidth = Math.max(10, ...items.map(i => getItemIdentifier(i).length));
+        if (useCsv) {
+            this.log('status,identifier,id,error');
+        }
+        else if (!useJson) {
+            this.log(`${'status'.padEnd(statusWidth)}  ${'identifier'.padEnd(identifierWidth)}  error`);
+            this.log(`${'-'.repeat(statusWidth)}  ${'-'.repeat(identifierWidth)}  ${'-'.repeat(50)}`);
+        }
+        const emitRow = (r) => {
+            if (useJson)
+                return;
+            if (useCsv) {
+                const err = (r.error || '').replace(/"/g, '""');
+                this.log(`${r.status},${r.identifier || ''},${r.id || ''},"${err}"`);
+            }
+            else {
+                this.log(`${r.status.padEnd(statusWidth)}  ${(r.identifier || '').padEnd(identifierWidth)}  ${r.error || ''}`);
+            }
+        };
+        // Server-managed fields the API rejects in create/update bodies. Stripped
+        // before every request so re-importing a previously-exported payload Just Works.
+        const STRIP_FIELDS = new Set(['id', '_type', 'tenantId', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy']);
+        const stripServerFields = (item) => {
+            const out = {};
+            for (const [k, v] of Object.entries(item)) {
+                if (!STRIP_FIELDS.has(k))
+                    out[k] = v;
+            }
+            return out;
+        };
+        const processItem = async (item) => {
             const identifier = getItemIdentifier(item);
+            const body = stripServerFields(item);
+            // If the payload carries an id (e.g. re-importing an export), PATCH directly.
+            // Fall through to POST only on 404 (so a missing record still gets created).
+            const itemId = typeof item.id === 'string' ? item.id : undefined;
+            if (itemId) {
+                try {
+                    const updatePath = updateEndpoint.path.replace('{id}', itemId);
+                    await apiRequest('PATCH', updatePath, {
+                        data: body,
+                        contextName: flags.context,
+                    });
+                    return { status: 'updated', id: itemId, identifier };
+                }
+                catch (error) {
+                    if (!(error instanceof ApiError && error.status === 404)) {
+                        const msg = error instanceof ApiError ? `(${error.status}) ${error.message}` : String(error);
+                        return { status: 'error', id: itemId, identifier, error: msg };
+                    }
+                    // 404 → record gone, try create below
+                }
+            }
             try {
-                // Try to create
                 const response = await apiRequest('POST', createEndpoint.path, {
-                    data: item,
+                    data: body,
                     contextName: flags.context,
                 });
                 const id = response.data?.id;
-                results.push({ status: 'created', id: id ? String(id) : undefined, identifier });
+                return { status: 'created', id: id ? String(id) : undefined, identifier };
             }
             catch (error) {
                 if (error instanceof ApiError && error.status === 409) {
-                    // Conflict - try to update existing
                     const errorData = error.data;
                     const existingId = errorData?.existingId;
                     if (existingId) {
                         try {
                             const updatePath = updateEndpoint.path.replace('{id}', existingId);
                             await apiRequest('PATCH', updatePath, {
-                                data: item,
+                                data: body,
                                 contextName: flags.context,
                             });
-                            results.push({ status: 'updated', id: existingId, identifier });
+                            return { status: 'updated', id: existingId, identifier };
                         }
                         catch (updateError) {
                             const msg = updateError instanceof ApiError ? updateError.message : String(updateError);
-                            results.push({ status: 'error', id: existingId, identifier, error: `Update failed: ${msg}` });
+                            return { status: 'error', id: existingId, identifier, error: `Update failed: ${msg}` };
                         }
                     }
-                    else {
-                        results.push({ status: 'error', identifier, error: 'Conflict but no existingId returned' });
-                    }
-                }
-                else {
-                    const msg = error instanceof ApiError ? `(${error.status}) ${error.message}` : String(error);
-                    results.push({ status: 'error', identifier, error: msg });
+                    return { status: 'error', identifier, error: 'Conflict but no existingId returned' };
                 }
+                const msg = error instanceof ApiError ? `(${error.status}) ${error.message}` : String(error);
+                return { status: 'error', identifier, error: msg };
             }
-        }
+        };
+        // Worker pool: keep N requests in flight at all times. Rows are emitted as
+        // each request resolves (so output order may differ from input order). The
+        // summary at the end remains accurate regardless.
+        const concurrency = 4;
+        const queue = [...items];
+        await Promise.all(Array.from({ length: Math.min(concurrency, queue.length) }, async () => {
+            for (;;) {
+                const item = queue.shift();
+                if (!item)
+                    return;
+                const r = await processItem(item);
+                results.push(r);
+                emitRow(r);
+            }
+        }));
         // Summary counts
         const created = results.filter(r => r.status === 'created').length;
         const updated = results.filter(r => r.status === 'updated').length;
         const errors = results.filter(r => r.status === 'error');
-        // Output results based on format (default: table)
-        const outputFormat = flags.output || 'table';
-        if (outputFormat === 'json') {
+        if (useJson) {
             this.log(JSON.stringify(results, null, 2));
         }
-        else if (outputFormat === 'csv' || flags.csv) {
-            // CSV output
-            this.log('status,identifier,id,error');
-            for (const r of results) {
-                const err = (r.error || '').replace(/"/g, '""');
-                this.log(`${r.status},${r.identifier || ''},${r.id || ''},"${err}"`);
-            }
-        }
-        else {
-            // Table output (default)
-            if (results.length > 0) {
-                const statusWidth = 8;
-                const identifierWidth = Math.max(10, ...results.map(r => (r.identifier || '').length));
-                this.log(`${'status'.padEnd(statusWidth)}  ${'identifier'.padEnd(identifierWidth)}  error`);
-                this.log(`${'-'.repeat(statusWidth)}  ${'-'.repeat(identifierWidth)}  ${'-'.repeat(50)}`);
-                for (const r of results) {
-                    const status = r.status === 'created' ? 'created' : r.status === 'updated' ? 'updated' : 'error';
-                    this.log(`${status.padEnd(statusWidth)}  ${(r.identifier || '').padEnd(identifierWidth)}  ${r.error || ''}`);
-                }
-            }
-        }
         // Always show summary at the end
         this.log('');
         this.log(`Summary: ${created} created, ${updated} updated, ${errors.length} failed`);
@@ -782,80 +832,122 @@ export default class Webhooks extends Command {
             return '';
         };
         const results = [];
-        for (const item of items) {
+        const stdoutHandle = process.stdout._handle;
+        if (stdoutHandle?.setBlocking)
+            stdoutHandle.setBlocking(true);
+        const outputFormat = flags.output || 'table';
+        const useCsv = outputFormat === 'csv' || Boolean(flags.csv);
+        const useJson = outputFormat === 'json';
+        const statusWidth = 8;
+        const identifierWidth = Math.max(10, ...items.map(i => getItemIdentifier(i).length));
+        if (useCsv) {
+            this.log('status,identifier,id,error');
+        }
+        else if (!useJson) {
+            this.log(`${'status'.padEnd(statusWidth)}  ${'identifier'.padEnd(identifierWidth)}  error`);
+            this.log(`${'-'.repeat(statusWidth)}  ${'-'.repeat(identifierWidth)}  ${'-'.repeat(50)}`);
+        }
+        const emitRow = (r) => {
+            if (useJson)
+                return;
+            if (useCsv) {
+                const err = (r.error || '').replace(/"/g, '""');
+                this.log(`${r.status},${r.identifier || ''},${r.id || ''},"${err}"`);
+            }
+            else {
+                this.log(`${r.status.padEnd(statusWidth)}  ${(r.identifier || '').padEnd(identifierWidth)}  ${r.error || ''}`);
+            }
+        };
+        const STRIP_FIELDS = new Set(['id', '_type', 'tenantId', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy']);
+        const stripServerFields = (item) => {
+            const out = {};
+            for (const [k, v] of Object.entries(item)) {
+                if (!STRIP_FIELDS.has(k))
+                    out[k] = v;
+            }
+            return out;
+        };
+        const buildUpdatePath = (existingId) => {
+            const firstUpdateParam = updateEndpoint.pathParams[0];
+            const nestedIdParam = updateEndpoint.pathParams.find((p, i) => i > 0);
+            let updatePath = updateEndpoint.path.replace(`{${firstUpdateParam}}`, parentId);
+            if (nestedIdParam) {
+                updatePath = updatePath.replace(`{${nestedIdParam}}`, existingId);
+            }
+            return updatePath;
+        };
+        const processItem = async (item) => {
             const identifier = getItemIdentifier(item);
+            const body = stripServerFields(item);
+            const itemId = typeof item.id === 'string' ? item.id : undefined;
+            if (itemId) {
+                try {
+                    await apiRequest('PATCH', buildUpdatePath(itemId), {
+                        data: body,
+                        contextName: flags.context,
+                    });
+                    return { status: 'updated', id: itemId, identifier };
+                }
+                catch (error) {
+                    if (!(error instanceof ApiError && error.status === 404)) {
+                        const msg = error instanceof ApiError ? `(${error.status}) ${error.message}` : String(error);
+                        return { status: 'error', id: itemId, identifier, error: msg };
+                    }
+                    // 404 → fall through and try create
+                }
+            }
             try {
-                // Try to create
                 const response = await apiRequest('POST', basePath, {
-                    data: item,
+                    data: body,
                     contextName: flags.context,
                 });
                 const id = response.data?.id;
-                results.push({ status: 'created', id: id ? String(id) : undefined, identifier });
+                return { status: 'created', id: id ? String(id) : undefined, identifier };
             }
             catch (error) {
                 if (error instanceof ApiError && error.status === 409) {
-                    // Conflict - try to update existing
                     const errorData = error.data;
                     const existingId = errorData?.existingId || item.id;
                     if (existingId) {
                         try {
-                            // Find the nested ID param name (e.g., 'priceId' for prices)
-                            const firstUpdateParam = updateEndpoint.pathParams[0];
-                            const nestedIdParam = updateEndpoint.pathParams.find((p, i) => i > 0);
-                            let updatePath = updateEndpoint.path.replace(`{${firstUpdateParam}}`, parentId);
-                            if (nestedIdParam) {
-                                updatePath = updatePath.replace(`{${nestedIdParam}}`, existingId);
-                            }
-                            await apiRequest('PATCH', updatePath, {
-                                data: item,
+                            await apiRequest('PATCH', buildUpdatePath(existingId), {
+                                data: body,
                                 contextName: flags.context,
                             });
-                            results.push({ status: 'updated', id: existingId, identifier });
+                            return { status: 'updated', id: existingId, identifier };
                         }
                         catch (updateError) {
                             const msg = updateError instanceof ApiError ? updateError.message : String(updateError);
-                            results.push({ status: 'error', id: existingId, identifier, error: `Update failed: ${msg}` });
+                            return { status: 'error', id: existingId, identifier, error: `Update failed: ${msg}` };
                         }
                     }
-                    else {
-                        results.push({ status: 'error', identifier, error: 'Conflict but no existingId returned' });
-                    }
-                }
-                else {
-                    const msg = error instanceof ApiError ? `(${error.status}) ${error.message}` : String(error);
-                    results.push({ status: 'error', identifier, error: msg });
+                    return { status: 'error', identifier, error: 'Conflict but no existingId returned' };
                 }
+                const msg = error instanceof ApiError ? `(${error.status}) ${error.message}` : String(error);
+                return { status: 'error', identifier, error: msg };
             }
-        }
+        };
+        // Worker pool: 4 requests in flight at a time. Rows are emitted as each
+        // request resolves so output order may differ from input order.
+        const concurrency = 4;
+        const queue = [...items];
+        await Promise.all(Array.from({ length: Math.min(concurrency, queue.length) }, async () => {
+            for (;;) {
+                const item = queue.shift();
+                if (!item)
+                    return;
+                const r = await processItem(item);
+                results.push(r);
+                emitRow(r);
+            }
+        }));
         // Summary counts
         const created = results.filter(r => r.status === 'created').length;
         const updated = results.filter(r => r.status === 'updated').length;
         const errors = results.filter(r => r.status === 'error');
-        // Output results based on format (default: table)
-        const outputFormat = flags.output || 'table';
-        if (outputFormat === 'json') {
+        if (useJson) {
             this.log(JSON.stringify(results, null, 2));
         }
-        else if (outputFormat === 'csv' || flags.csv) {
-            this.log('status,identifier,id,error');
-            for (const r of results) {
-                const err = (r.error || '').replace(/"/g, '""');
-                this.log(`${r.status},${r.identifier || ''},${r.id || ''},"${err}"`);
-            }
-        }
-        else {
-            if (results.length > 0) {
-                const statusWidth = 8;
-                const identifierWidth = Math.max(10, ...results.map(r => (r.identifier || '').length));
-                this.log(`${'status'.padEnd(statusWidth)}  ${'identifier'.padEnd(identifierWidth)}  error`);
-                this.log(`${'-'.repeat(statusWidth)}  ${'-'.repeat(identifierWidth)}  ${'-'.repeat(50)}`);
-                for (const r of results) {
-                    const status = r.status === 'created' ? 'created' : r.status === 'updated' ? 'updated' : 'error';
-                    this.log(`${status.padEnd(statusWidth)}  ${(r.identifier || '').padEnd(identifierWidth)}  ${r.error || ''}`);
-                }
-            }
-        }
         this.log('');
         this.log(`Summary: ${created} created, ${updated} updated, ${errors.length} failed`);
     }
@@ -1019,12 +1111,24 @@ export default class Webhooks extends Command {
         return { cols: flatten ? cols : cols.slice(0, 8), items: items };
     }
     getValue(row, col) {
-        let val = row[col];
-        if (col.includes('.')) {
-            const parts = col.split('.');
-            val = parts.reduce((o, k) => (o && typeof o === 'object' ? o[k] : undefined), row);
-        }
-        return String(val ?? '');
+        if (!col.includes('.'))
+            return String(row[col] ?? '');
+        const parts = col.split('.');
+        // Walk the dot-path; descending through an array branches into every
+        // element so leaf values get collected from each one. Multiple leaves are
+        // joined with ';' (e.g. dunningReminders.id -> "uuid1;uuid2").
+        const walk = (o, idx) => {
+            if (idx >= parts.length)
+                return [o];
+            if (o == null)
+                return [];
+            if (Array.isArray(o))
+                return o.flatMap(item => walk(item, idx));
+            if (typeof o === 'object')
+                return walk(o[parts[idx]], idx + 1);
+            return [];
+        };
+        return walk(row, 0).filter(v => v !== undefined && v !== null).map(v => String(v)).join(';');
     }
     printTable(data, fields) {
         const { cols, items } = this.getColumns(data, fields);