@solution25/n8n-nodes-shopware 1.4.4 → 2.0.0

package/dist/nodes/Shopware/v1/actions/order/create.operation.js

@@ -6,6 +6,9 @@ const n8n_workflow_1 = require("n8n-workflow");
 const transport_1 = require("../../transport");
 const fields_1 = require("./fields");
 const utils_1 = require("../../helpers/utils");
+const payloadBuilders_1 = require("../../helpers/payloadBuilders");
+const pricing_1 = require("../../helpers/pricing");
+const params_1 = require("../../helpers/params");
 const properties = [
     {
         displayName: 'Order Number',
@@ -159,6 +162,20 @@ const properties = [
                         default: '',
                         description: 'Customer last name',
                     },
+                    {
+                        displayName: 'Zip Code',
+                        name: 'zipcode',
+                        type: 'string',
+                        default: '',
+                        description: 'Billing address postal code',
+                    },
+                    {
+                        displayName: 'State / Province',
+                        name: 'state',
+                        type: 'string',
+                        default: '',
+                        description: 'Optional state or province name/code for the billing address',
+                    },
                     {
                         displayName: 'City',
                         name: 'city',
@@ -226,6 +243,20 @@ const properties = [
                         default: '',
                         description: 'Customer last name',
                     },
+                    {
+                        displayName: 'Zip Code',
+                        name: 'zipcode',
+                        type: 'string',
+                        default: '',
+                        description: 'Shipping address postal code',
+                    },
+                    {
+                        displayName: 'State / Province',
+                        name: 'state',
+                        type: 'string',
+                        default: '',
+                        description: 'Optional state or province name/code for the shipping address',
+                    },
                     {
                         displayName: 'City',
                         name: 'city',
@@ -304,7 +335,7 @@ const properties = [
                         type: 'number',
                         typeOptions: {
                             maxValue: 999000000,
-                            minValue: 0,
+                            minValue: 1,
                         },
                         required: true,
                         default: 1,
@@ -447,6 +478,20 @@ const properties = [
                                         default: '',
                                         description: 'Customer last name',
                                     },
+                                    {
+                                        displayName: 'Zip Code',
+                                        name: 'zipcode',
+                                        type: 'string',
+                                        default: '',
+                                        description: 'Shipping address postal code',
+                                    },
+                                    {
+                                        displayName: 'State / Province',
+                                        name: 'state',
+                                        type: 'string',
+                                        default: '',
+                                        description: 'Optional state or province name/code for the shipping address',
+                                    },
                                     {
                                         displayName: 'City',
                                         name: 'city',
@@ -480,182 +525,136 @@ const displayOptions = {
 };
 exports.description = (0, n8n_workflow_1.updateDisplayOptions)(displayOptions, properties);
 async function execute(items) {
+    var _a, _b, _c;
     const returnData = [];
+    let defaultLanguageIdPromise;
+    let defaultShippingMethodPromise;
+    const shippingMethodDataCache = new Map();
+    const countryStateCache = new Map();
     for (let i = 0; i < items.length; i++) {
         try {
             const orderId = (0, utils_1.uuidv7)();
+            const params = params_1.extractOrderCreateParams.call(this, i);
+            const lineItemLookup = await utils_1.getLineItemDataBatch.call(this, ((_a = params.nodeLineItems) !== null && _a !== void 0 ? _a : []).map((lineItem) => lineItem.productNumber), params.currencyData[0], i);
             const customerData = {};
             const globalDefaults = {};
             let orderCustomer;
-            const customerNumber = !this.getNodeParameter('guestOrder', i)
-                ? this.getNodeParameter('customerNumber', i)
-                : null;
-            if (customerNumber) {
-                const customer = await utils_1.getCustomerByNumber.call(this, customerNumber, i);
+            if (params.customerNumber) {
+                const customer = await utils_1.getCustomerByNumber.call(this, params.customerNumber, i);
                 globalDefaults.languageId = customer.languageId;
                 globalDefaults.salesChannelId = customer.salesChannelId;
                 customerData.firstName = customer.firstName;
                 customerData.lastName = customer.lastName;
                 customerData.email = customer.email;
                 customerData.salutationId = customer.salutationId;
-                customerData.billingAddress = customer.billingAddress;
-                customerData.shippingAddress = customer.shippingAddress;
+                customerData.billingAddress = {
+                    ...customer.billingAddress,
+                    id: (0, utils_1.uuidv7)(),
+                };
+                customerData.shippingAddress = {
+                    ...customer.shippingAddress,
+                    id: (0, utils_1.uuidv7)(),
+                };
                 orderCustomer = {
                     firstName: customer.firstName,
                     lastName: customer.lastName,
                     email: customer.email,
                     salutationId: customer.salutationId,
                     customerId: customer.id,
-                    customerNumber,
+                    customerNumber: params.customerNumber,
                 };
             }
             else {
-                const guest = this.getNodeParameter('guestUi', i)
-                    .guestValues;
-                const guestBillingAddress = this.getNodeParameter('billingAddressUi', i).billingAddressValues;
-                const guestShippingAddress = this.getNodeParameter('shippingAddressUi', i).shippingAddressValues;
-                globalDefaults.languageId = await utils_1.getDefaultLanguageId.call(this);
-                globalDefaults.salesChannelId = this.getNodeParameter('salesChannel', i);
-                customerData.firstName = guest.firstName;
-                customerData.lastName = guest.lastName;
-                customerData.email = guest.email;
-                customerData.salutationId = guest.salutation;
+                defaultLanguageIdPromise !== null && defaultLanguageIdPromise !== void 0 ? defaultLanguageIdPromise : (defaultLanguageIdPromise = utils_1.getDefaultLanguageId.call(this));
+                globalDefaults.languageId = await defaultLanguageIdPromise;
+                globalDefaults.salesChannelId = params.salesChannel;
+                customerData.firstName = params.guest.firstName;
+                customerData.lastName = params.guest.lastName;
+                customerData.email = params.guest.email;
+                customerData.salutationId = params.guest.salutation;
                 customerData.billingAddress = {
                     id: (0, utils_1.uuidv7)(),
-                    countryId: guestBillingAddress.country,
-                    firstName: guestBillingAddress.firstName,
-                    lastName: guestBillingAddress.lastName,
-                    city: guestBillingAddress.city,
-                    street: guestBillingAddress.street,
+                    countryId: params.guestBillingAddress.country,
+                    countryStateId: await utils_1.resolveCountryStateId.call(this, params.guestBillingAddress.country, params.guestBillingAddress.state, countryStateCache, i, 'Billing state / province'),
+                    salutationId: params.guest.salutation,
+                    firstName: params.guestBillingAddress.firstName,
+                    lastName: params.guestBillingAddress.lastName,
+                    zipcode: (_b = params.guestBillingAddress.zipcode) !== null && _b !== void 0 ? _b : '',
+                    city: params.guestBillingAddress.city,
+                    street: params.guestBillingAddress.street,
                 };
                 customerData.shippingAddress = {
                     id: (0, utils_1.uuidv7)(),
-                    countryId: guestShippingAddress.country,
-                    firstName: guestShippingAddress.firstName,
-                    lastName: guestShippingAddress.lastName,
-                    city: guestShippingAddress.city,
-                    street: guestShippingAddress.street,
+                    countryId: params.guestShippingAddress.country,
+                    countryStateId: await utils_1.resolveCountryStateId.call(this, params.guestShippingAddress.country, params.guestShippingAddress.state, countryStateCache, i, 'Shipping state / province'),
+                    salutationId: params.guest.salutation,
+                    firstName: params.guestShippingAddress.firstName,
+                    lastName: params.guestShippingAddress.lastName,
+                    zipcode: (_c = params.guestShippingAddress.zipcode) !== null && _c !== void 0 ? _c : '',
+                    city: params.guestShippingAddress.city,
+                    street: params.guestShippingAddress.street,
                 };
                 orderCustomer = {
-                    firstName: guest.firstName,
-                    lastName: guest.lastName,
-                    email: guest.email,
-                    salutationId: guest.salutation,
+                    firstName: params.guest.firstName,
+                    lastName: params.guest.lastName,
+                    email: params.guest.email,
+                    salutationId: params.guest.salutation,
                     customerNumber: 'guest-' + (0, n8n_workflow_1.randomString)(6),
                 };
             }
-            const currencyData = this.getNodeParameter('currency', i).split('-');
-            const nodeLineItems = this.getNodeParameter('lineItems', i).lineItem;
-            if (!nodeLineItems || nodeLineItems.length === 0) {
+            if (!params.nodeLineItems || params.nodeLineItems.length === 0) {
                 throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Missing order line items', {
                     description: 'At least one line item must be provided',
                     itemIndex: i,
                 });
             }
-            const lineItems = await Promise.all(nodeLineItems.map(async (lineItem) => {
-                const { identifier, productId, label, states, unitPrice, taxRate } = await utils_1.getLineItemData.call(this, lineItem.productNumber, currencyData[0], i);
-                const quantity = lineItem.quantity;
-                const totalPrice = unitPrice * quantity;
-                const tax = totalPrice * (taxRate / 100);
-                const taxPrice = totalPrice + tax;
-                const price = {
-                    unitPrice,
-                    totalPrice,
-                    quantity,
-                    calculatedTaxes: [
-                        {
-                            tax,
-                            taxRate,
-                            price: taxPrice,
-                        },
-                    ],
-                    taxRules: [
-                        {
-                            taxRate,
-                            percentage: 100,
-                        },
-                    ],
-                };
-                return {
-                    identifier,
-                    productId,
-                    quantity,
-                    label,
-                    states,
-                    price,
-                };
+            const lineItems = await Promise.all(params.nodeLineItems.map(async (lineItem) => {
+                const itemData = lineItemLookup.get(lineItem.productNumber);
+                if (!itemData) {
+                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'No product found', {
+                        description: 'There is no product associated with product number ' + lineItem.productNumber,
+                        itemIndex: i,
+                    });
+                }
+                return (0, payloadBuilders_1.buildLineItemPayload)({ ...itemData, quantity: lineItem.quantity });
             }));
-            const defaultTaxRate = await utils_1.getDefaultTaxRate.call(this);
-            const totalPrice = lineItems.reduce((acc, item) => acc + item.price.totalPrice, 0);
-            const orderTax = totalPrice * (defaultTaxRate / 100);
-            const taxPrice = totalPrice + orderTax;
-            const quantity = lineItems.reduce((acc, item) => acc + item.quantity, 0);
-            const price = {
-                netPrice: totalPrice,
-                totalPrice: taxPrice,
-                calculatedTaxes: [
-                    {
-                        tax: orderTax,
-                        taxRate: defaultTaxRate,
-                        price: taxPrice,
-                    },
-                ],
-                taxRules: [
-                    {
-                        taxRate: defaultTaxRate,
-                        percentage: 100,
-                    },
-                ],
-                positionPrice: totalPrice,
-                rawTotal: totalPrice,
-                taxStatus: 'gross',
-            };
+            const orderTotals = (0, pricing_1.calculateOrderTotals)(lineItems);
+            const price = (0, payloadBuilders_1.buildOrderPrice)({
+                netPrice: orderTotals.netPrice,
+                totalPrice: orderTotals.totalPrice,
+                calculatedTaxes: orderTotals.calculatedTaxes,
+                taxRules: orderTotals.taxRules,
+            });
             let transactions = [];
-            const nodeTransactions = this.getNodeParameter('transactions', i).transaction;
-            if (nodeTransactions && nodeTransactions.length > 0) {
-                transactions = nodeTransactions.map((transaction) => {
-                    const amount = {
-                        unitPrice: totalPrice,
-                        totalPrice: taxPrice,
-                        quantity,
-                        calculatedTaxes: [
-                            {
-                                tax: orderTax,
-                                taxRate: defaultTaxRate,
-                                price: taxPrice,
-                            },
-                        ],
-                        taxRules: [
-                            {
-                                taxRate: defaultTaxRate,
-                                percentage: 100,
-                            },
-                        ],
-                    };
-                    return {
-                        paymentMethodId: transaction.paymentMethod,
-                        stateId: transaction.state,
-                        amount,
-                    };
-                });
+            if (params.nodeTransactions && params.nodeTransactions.length > 0) {
+                transactions = params.nodeTransactions.map((transaction) => (0, payloadBuilders_1.buildTransactionPayload)({
+                    paymentMethodId: transaction.paymentMethod,
+                    stateId: transaction.state,
+                    netPrice: orderTotals.netPrice,
+                    totalPrice: orderTotals.totalPrice,
+                    quantity: orderTotals.quantity,
+                    calculatedTaxes: orderTotals.calculatedTaxes,
+                    taxRules: orderTotals.taxRules,
+                }));
             }
-            const addresses = [
-                {
-                    id: customerData.shippingAddress.id,
-                    countryId: customerData.shippingAddress.countryId,
-                    firstName: customerData.shippingAddress.firstName,
-                    lastName: customerData.shippingAddress.lastName,
-                    city: customerData.shippingAddress.city,
-                    street: customerData.shippingAddress.street,
-                },
-            ];
+            const customerShippingAddress = (0, payloadBuilders_1.buildOrderAddressPayload)({
+                id: customerData.shippingAddress.id,
+                countryId: customerData.shippingAddress.countryId,
+                countryStateId: customerData.shippingAddress.countryStateId,
+                salutationId: customerData.shippingAddress.salutationId,
+                firstName: customerData.shippingAddress.firstName,
+                lastName: customerData.shippingAddress.lastName,
+                zipcode: customerData.shippingAddress.zipcode,
+                city: customerData.shippingAddress.city,
+                street: customerData.shippingAddress.street,
+            });
             let deliveries = [];
-            const nodeDeliveries = this.getNodeParameter('deliveries', i).delivery;
-            if (nodeDeliveries && nodeDeliveries.length > 0) {
-                deliveries = await Promise.all(nodeDeliveries.map(async (delivery) => {
-                    let shippingOrderAddressId;
+            if (params.nodeDeliveries && params.nodeDeliveries.length > 0) {
+                deliveries = await Promise.all(params.nodeDeliveries.map(async (delivery) => {
+                    var _a;
+                    let shippingAddress;
                     if (delivery.customerShippingAddress) {
-                        shippingOrderAddressId = addresses[0].id;
+                        shippingAddress = { ...customerShippingAddress, id: (0, utils_1.uuidv7)() };
                     }
                     else {
                         const address = delivery.addressUi.addressValues;
@@ -665,7 +664,7 @@ async function execute(items) {
                                 itemIndex: i,
                             });
                         }
-                        for (const key in address) {
+                        for (const key of ['country', 'firstName', 'lastName', 'city', 'street']) {
                             if (address[key] === '') {
                                 throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Missing required value for shipping address', {
                                     description: `Shipping address ${key} must be a valid value.`,
@@ -673,172 +672,89 @@ async function execute(items) {
                                 });
                             }
                         }
-                        shippingOrderAddressId = (0, utils_1.uuidv7)();
-                        addresses.push({
-                            id: shippingOrderAddressId,
+                        shippingAddress = (0, payloadBuilders_1.buildOrderAddressPayload)({
+                            id: (0, utils_1.uuidv7)(),
                             countryId: address.country,
+                            countryStateId: await utils_1.resolveCountryStateId.call(this, address.country, address.state, countryStateCache, i, 'Delivery state / province'),
+                            salutationId: customerData.salutationId,
                             firstName: address.firstName,
                             lastName: address.lastName,
+                            zipcode: (_a = address.zipcode) !== null && _a !== void 0 ? _a : '',
                             city: address.city,
                             street: address.street,
                         });
                     }
-                    const { ['unitPrice']: shippingPrice, ['taxRate']: shippingTaxRate } = await utils_1.getShippingMethodData.call(this, delivery.shippingMethod, currencyData[0]);
-                    const deliveryTime = await utils_1.getShippingDeliveryTime.call(this, delivery.shippingMethod);
-                    const shippingTax = shippingPrice * (shippingTaxRate / 100);
-                    const shippingTaxPrice = shippingPrice + shippingTax;
-                    const shippingCosts = {
-                        unitPrice: shippingPrice,
-                        totalPrice: shippingPrice,
-                        quantity: 1,
-                        calculatedTaxes: [
-                            {
-                                tax: shippingTax,
-                                taxRate: shippingTaxRate,
-                                price: shippingTaxPrice,
-                            },
-                        ],
-                        taxRules: [
-                            {
-                                taxRate: shippingTaxRate,
-                                percentage: 100,
-                            },
-                        ],
-                    };
-                    const shippingDateEarliest = new Date();
-                    const shippingDateLatest = new Date();
-                    switch (deliveryTime.unit) {
-                        case 'hour':
-                            shippingDateEarliest.setHours(shippingDateEarliest.getHours() + deliveryTime.min);
-                            shippingDateLatest.setHours(shippingDateLatest.getHours() + deliveryTime.max);
-                            break;
-                        case 'day':
-                            shippingDateEarliest.setDate(shippingDateEarliest.getDate() + deliveryTime.min);
-                            shippingDateLatest.setDate(shippingDateLatest.getDate() + deliveryTime.max);
-                            break;
-                        case 'week':
-                            shippingDateEarliest.setDate(shippingDateEarliest.getDate() + deliveryTime.min * 7);
-                            shippingDateLatest.setDate(shippingDateLatest.getDate() + deliveryTime.max * 7);
-                            break;
+                    const shippingMethodDataKey = `${delivery.shippingMethod}:${params.currencyData[0]}`;
+                    if (!shippingMethodDataCache.has(shippingMethodDataKey)) {
+                        shippingMethodDataCache.set(shippingMethodDataKey, Promise.resolve(utils_1.getShippingMethodFullData.call(this, delivery.shippingMethod, params.currencyData[0])));
                     }
-                    return {
-                        shippingOrderAddressId,
+                    const shippingMethodData = await shippingMethodDataCache.get(shippingMethodDataKey);
+                    return (0, payloadBuilders_1.buildDeliveryPayload)({
+                        shippingAddress,
                         shippingMethodId: delivery.shippingMethod,
                         stateId: delivery.state,
-                        shippingDateEarliest,
-                        shippingDateLatest,
-                        shippingCosts,
-                    };
+                        shippingPrice: shippingMethodData.unitPrice,
+                        shippingTaxRate: shippingMethodData.taxRate,
+                        deliveryTime: shippingMethodData.deliveryTime,
+                        lineItems,
+                        uuidFn: utils_1.uuidv7,
+                    });
                 }));
             }
             let shippingCosts;
             if (deliveries.length === 0) {
-                const defaultShippingMethod = await utils_1.getDefaultShippingMethod.call(this);
-                const { ['unitPrice']: shippingPrice, ['taxRate']: shippingTaxRate } = await utils_1.getShippingMethodData.call(this, defaultShippingMethod, currencyData[0]);
-                const shippingTax = shippingPrice * (shippingTaxRate / 100);
-                const shippingTaxPrice = shippingPrice + shippingTax;
-                shippingCosts = {
-                    unitPrice: shippingPrice,
-                    totalPrice: shippingPrice,
-                    quantity: 1,
-                    calculatedTaxes: [
-                        {
-                            tax: shippingTax,
-                            taxRate: shippingTaxRate,
-                            price: shippingTaxPrice,
-                        },
-                    ],
-                    taxRules: [
-                        {
-                            taxRate: shippingTaxRate,
-                            percentage: 100,
-                        },
-                    ],
-                };
+                defaultShippingMethodPromise !== null && defaultShippingMethodPromise !== void 0 ? defaultShippingMethodPromise : (defaultShippingMethodPromise = utils_1.getDefaultShippingMethod.call(this));
+                const defaultShippingMethod = await defaultShippingMethodPromise;
+                const shippingMethodDataKey = `${defaultShippingMethod}:${params.currencyData[0]}`;
+                if (!shippingMethodDataCache.has(shippingMethodDataKey)) {
+                    shippingMethodDataCache.set(shippingMethodDataKey, Promise.resolve(utils_1.getShippingMethodFullData.call(this, defaultShippingMethod, params.currencyData[0])));
+                }
+                const shippingMethodData = await shippingMethodDataCache.get(shippingMethodDataKey);
+                deliveries = [
+                    (0, payloadBuilders_1.buildDeliveryPayload)({
+                        shippingAddress: { ...customerShippingAddress, id: (0, utils_1.uuidv7)() },
+                        shippingMethodId: defaultShippingMethod,
+                        stateId: params.stateId,
+                        shippingPrice: shippingMethodData.unitPrice,
+                        shippingTaxRate: shippingMethodData.taxRate,
+                        deliveryTime: shippingMethodData.deliveryTime,
+                        lineItems,
+                        uuidFn: utils_1.uuidv7,
+                    }),
+                ];
+                shippingCosts = (0, payloadBuilders_1.aggregateDeliveryShippingCosts)(deliveries);
             }
             else {
-                const deliveriesUnitPrice = deliveries.reduce((acc, delivery) => acc + delivery.shippingCosts.unitPrice, 0);
-                const deliveriesTax = deliveries.reduce((acc, delivery) => acc + delivery.shippingCosts.calculatedTaxes[0].tax, 0);
-                const deliveriesTaxRate = deliveries[0].shippingCosts.taxRules[0].taxRate;
-                const deliveriesTaxPrice = deliveriesUnitPrice + deliveriesTax;
-                shippingCosts = {
-                    unitPrice: deliveriesUnitPrice,
-                    totalPrice: deliveriesUnitPrice,
-                    quantity: 1,
-                    calculatedTaxes: [
-                        {
-                            tax: deliveriesTax,
-                            taxRate: deliveriesTaxRate,
-                            price: deliveriesTaxPrice,
-                        },
-                    ],
-                    taxRules: [
-                        {
-                            taxRate: deliveriesTaxRate,
-                            percentage: 100,
-                        },
-                    ],
-                };
+                shippingCosts = (0, payloadBuilders_1.aggregateDeliveryShippingCosts)(deliveries);
             }
-            const parsedItemRounding = JSON.parse(currencyData[3]);
-            const itemRounding = {
-                decimals: parsedItemRounding.decimals,
-                interval: parsedItemRounding.interval,
-                roundForNet: parsedItemRounding.roundForNet,
-            };
-            const parsedTotalRounding = JSON.parse(currencyData[4]);
-            const totalRounding = {
-                decimals: parsedTotalRounding.decimals,
-                interval: parsedTotalRounding.interval,
-                roundForNet: parsedTotalRounding.roundForNet,
-            };
-            const serializedBillingAddress = {
-                id: customerData.billingAddress.id,
-                countryId: customerData.billingAddress.countryId,
-                firstName: customerData.billingAddress.firstName,
-                lastName: customerData.billingAddress.lastName,
-                city: customerData.billingAddress.city,
-                street: customerData.billingAddress.street,
-            };
-            const createBody = {
-                id: orderId,
-                currencyId: currencyData[0],
-                languageId: globalDefaults.languageId,
-                salesChannelId: globalDefaults.salesChannelId,
-                billingAddressId: customerData.billingAddress.id,
-                orderNumber: this.getNodeParameter('orderNumber', i),
-                orderDateTime: this.getNodeParameter('dateAndTime', i),
-                stateId: this.getNodeParameter('state', i),
-                currencyFactor: parseInt(currencyData[2]),
-                itemRounding,
-                totalRounding,
+            const createBody = (0, payloadBuilders_1.buildOrderCreatePayload)({
+                orderId,
+                currencyData: params.currencyData,
+                globalDefaults,
+                customerData,
                 orderCustomer,
-                billingAddress: serializedBillingAddress,
                 lineItems,
                 price,
                 shippingCosts,
                 transactions,
                 deliveries,
-                addresses,
-            };
+                orderNumber: params.orderNumber,
+                dateAndTime: params.dateAndTime,
+                stateId: params.stateId,
+            });
+            (0, payloadBuilders_1.cleanPayload)(createBody);
+            await transport_1.apiRequest.call(this, 'POST', `/order`, createBody);
             const searchBody = {
                 fields: fields_1.orderFields,
-                includes: {
-                    order: fields_1.orderFields,
-                },
+                includes: { order: fields_1.orderFields },
                 filter: [{ type: 'equals', field: 'id', value: orderId }],
+                associations: {
+                    currency: {},
+                    deliveries: {},
+                    transactions: {},
+                    lineItems: {},
+                },
             };
-            for (const key in createBody) {
-                const typedKey = key;
-                if (Array.isArray(createBody[typedKey]) &&
-                    createBody[typedKey].length === 0) {
-                    delete createBody[typedKey];
-                }
-                else if (createBody[typedKey] === '') {
-                    delete createBody[typedKey];
-                }
-            }
-            await transport_1.apiRequest.call(this, 'POST', `/order`, createBody);
             const response = await transport_1.apiRequest.call(this, 'POST', `/search/order`, searchBody);
             const executionData = this.helpers.constructExecutionMetaData((0, utils_1.wrapData)(response.data), {
                 itemData: { item: i },
@@ -850,7 +766,7 @@ async function execute(items) {
                 returnData.push({ json: { error: error.message } });
                 continue;
             }
-            if (error instanceof n8n_workflow_1.NodeOperationError) {
+            if (error instanceof n8n_workflow_1.NodeOperationError || error instanceof n8n_workflow_1.NodeApiError) {
                 throw error;
             }
             throw new n8n_workflow_1.NodeApiError(this.getNode(), error);