@shushed/helpers 0.0.226-fix-erp-631-20260105165305 → 0.0.226

package/dist/cjs/src-public/airtable.js

@@ -42,71 +42,107 @@ class AirtableHelper extends runtime_1.default {
         }
         return existingRecord;
     }
-    async updateMultiple(payload, options = {}, callIdx = 0, collectedResult = {
-        updatedRecords: [],
-        createdRecords: [],
-        records: []
-    }) {
+    async updateMultiple(payload, options = {}) {
         let response = null;
         const tableUrl = `https://api.airtable.com/v0/${this.baseId}/${this.tableId}`;
-        const currentBatch = payload.slice(callIdx * 10, (callIdx + 1) * 10);
-        try {
-            response = await fetch(`${tableUrl}`, {
-                method: "PATCH",
-                headers: {
-                    Authorization: `Bearer ${this.apiKey}`,
-                    "Content-Type": "application/json",
-                },
-                body: JSON.stringify({
-                    performUpsert: {
-                        fieldsToMergeOn: (options.fieldsToMergeOn ?? [this.primaryKeyFieldName]).map(x => this.dictionary[x] || x),
-                    },
-                    returnFieldsByFieldId: true,
-                    typecast: options.typecast || false,
-                    records: currentBatch.map(x => {
-                        const recordId = x.$recordId;
-                        const fieldsWithoutRecordId = { ...x };
-                        delete fieldsWithoutRecordId.$recordId;
-                        const record = {
-                            fields: AirtableHelper.convertToDictionary(this.dictionary, this.primaryKeyWritable === false
-                                ? AirtableHelper.removePrimaryKey(fieldsWithoutRecordId, this.primaryKeyFieldName)
-                                : fieldsWithoutRecordId),
-                        };
-                        if (recordId) {
-                            record.id = recordId;
-                        }
-                        return record;
-                    })
-                }),
+        const batchSize = 10;
+        let collectedResult = {
+            updatedRecords: [],
+            createdRecords: [],
+            records: []
+        };
+        const fieldsToMergeOn = (options.fieldsToMergeOn || [this.primaryKeyFieldName]);
+        const fieldsToMergeOnIds = fieldsToMergeOn.map(x => this.dictionary[x] || x);
+        let callIdx = 0;
+        const payloadDeduplicated = payload.filter((x, idx, self) => idx === self.findIndex((t) => fieldsToMergeOn.every(field => (0, lodash_isequal_1.default)(t[field], x[field]))));
+        const maxCallIdx = Math.ceil(payloadDeduplicated.length / batchSize);
+        while (callIdx < maxCallIdx) {
+            const currentBatch = payloadDeduplicated.slice(callIdx * batchSize, (callIdx + 1) * batchSize);
+            const recordsInBatch = currentBatch.map(x => {
+                const recordId = x.$recordId;
+                const fieldsWithoutRecordId = { ...x };
+                delete fieldsWithoutRecordId.$recordId;
+                const record = {
+                    fields: AirtableHelper.convertToDictionary(this.dictionary, this.primaryKeyWritable === false
+                        ? AirtableHelper.removePrimaryKey(fieldsWithoutRecordId, this.primaryKeyFieldName)
+                        : fieldsWithoutRecordId),
+                };
+                if (recordId) {
+                    record.id = recordId;
+                }
+                return record;
             });
-            if (!response.ok && response) {
-                const text = await response.text().catch(() => `${response?.status || 'unknown'}`);
-                throw new Error(text);
+            try {
+                response = await fetch(`${tableUrl}`, {
+                    method: "PATCH",
+                    headers: {
+                        Authorization: `Bearer ${this.apiKey}`,
+                        "Content-Type": "application/json",
+                    },
+                    body: JSON.stringify({
+                        performUpsert: {
+                            fieldsToMergeOn: fieldsToMergeOnIds,
+                        },
+                        returnFieldsByFieldId: true,
+                        typecast: options.typecast || false,
+                        records: recordsInBatch
+                    }),
+                });
+                if (!response.ok && response) {
+                    const text = await response.text().catch(() => `${response?.status || 'unknown'}`);
+                    throw new Error(text);
+                }
+                const resp = (await response.json());
+                collectedResult = {
+                    updatedRecords: collectedResult.updatedRecords.concat(resp.updatedRecords),
+                    createdRecords: collectedResult.createdRecords.concat(resp.createdRecords),
+                    records: collectedResult.records.concat(resp.records.map(x => AirtableHelper.translateFields(this.dictionary, x)))
+                };
             }
-            const resp = (await response.json());
-            const nextCollectedResult = {
-                updatedRecords: collectedResult.updatedRecords.concat(resp.updatedRecords),
-                createdRecords: collectedResult.createdRecords.concat(resp.createdRecords),
-                records: collectedResult.records.concat(resp.records.map(x => AirtableHelper.translateFields(this.dictionary, x)))
-            };
-            if (payload.length > (callIdx + 1) * 10) {
-                return this.updateMultiple(payload, options, callIdx + 1, nextCollectedResult);
+            catch (err) {
+                const errorMessage = `Failed to update records in ${this.tableId} table (baseId: ${this.baseId}). Status: ${response?.status || 'unknown'}. Error: ${err.message}`;
+                const batchErrors = currentBatch.map(() => new Error(errorMessage));
+                collectedResult = {
+                    updatedRecords: collectedResult.updatedRecords,
+                    createdRecords: collectedResult.createdRecords,
+                    records: collectedResult.records.concat(batchErrors)
+                };
+            }
+            finally {
+                callIdx += 1;
             }
-            return nextCollectedResult;
         }
-        catch (err) {
-            const errorMessage = `Failed to update records in ${this.tableId} table (baseId: ${this.baseId}). Status: ${response?.status || 'unknown'}. Error: ${err.message}`;
-            const batchErrors = currentBatch.map(() => new Error(errorMessage));
-            const nextCollectedResult = {
-                updatedRecords: collectedResult.updatedRecords,
-                createdRecords: collectedResult.createdRecords,
-                records: collectedResult.records.concat(batchErrors)
-            };
-            if (payload.length > (callIdx + 1) * 10) {
-                return this.updateMultiple(payload, options, callIdx + 1, nextCollectedResult);
+        const resultInOrder = [];
+        for (let i = 0; i < payload.length; i++) {
+            let j = 0;
+            let foundMatchingRecord = null;
+            while (j < collectedResult.records.length && foundMatchingRecord === null) {
+                let isMatching = true;
+                let k = 0;
+                while (k < fieldsToMergeOn.length && isMatching) {
+                    const field = fieldsToMergeOn[k];
+                    if (!(0, lodash_isequal_1.default)(collectedResult.records[j].fields[field], payload[i][field])) {
+                        isMatching = false;
+                    }
+                    k += 1;
+                }
+                if (isMatching) {
+                    foundMatchingRecord = j;
+                }
+                j += 1;
+            }
+            if (foundMatchingRecord !== null) {
+                resultInOrder.push(collectedResult.records[foundMatchingRecord]);
+            }
+            else {
+                resultInOrder.push(new Error(`Record ${payload[i][this.primaryKeyFieldName]} does not match any record in the response`));
             }
-            return nextCollectedResult;
         }
+        return {
+            updatedRecords: collectedResult.updatedRecords,
+            createdRecords: collectedResult.createdRecords,
+            records: resultInOrder
+        };
     }
     async upsert(payload) {
         const existingRecord = await this.getExistingRecord(payload);
@@ -258,9 +294,10 @@ class AirtableHelper extends runtime_1.default {
         const escapeFormulaValue = (value) => {
             return value.replace(/"/g, '\\"');
         };
+        const dedupedKeys = keys.filter((x, idx, self) => self.indexOf(x) === idx);
         const batchSize = 50;
-        for (let i = 0; i < keys.length; i += batchSize) {
-            const batch = keys.slice(i, i + batchSize);
+        for (let i = 0; i < dedupedKeys.length; i += batchSize) {
+            const batch = dedupedKeys.slice(i, i + batchSize);
             const orConditions = batch.map(key => `${this.dictionary[this.primaryKeyFieldName]} = "${escapeFormulaValue(key)}"`).join(', ');
             const formula = `OR(${orConditions})`;
             const records = await this.getExistingRecords(formula);

package/dist/cjs/src-public/bcOrder.js

@@ -169,33 +169,30 @@ function transformMasterOrder(payload) {
         if (desc)
             skuByDescription[desc] = sku;
     });
-    const isShippableItem = (line) => {
-        const itemNo = String(line?.item_no || line?.no || '');
-        const variantCode = String(line?.variant_code || '');
-        const amount = Number(line?.amount || line?.amount_excl_vat || 0);
-        const amountGross = Number(line?.amount_including_vat || line?.amount_incl_vat || 0);
-        const quantity = Number(line?.quantity || 0);
-        const hasStyleAndColour = itemNo.includes('-');
-        const hasSize = variantCode.trim().length > 0;
-        const hasValue = amount > 0 || amountGross > 0 || quantity > 0;
-        const hasQuantity = quantity > 0;
-        return Boolean(hasStyleAndColour && hasSize && hasValue && hasQuantity);
+    const isItemish = (type, itemNo, desc) => {
+        const t = String(type || '').toLowerCase();
+        return t.includes('item') || itemNo.includes('-') || desc.includes(' - ');
     };
     const returnedQtyBySku = {};
     (payload.credit_memos || []).forEach((cm) => {
         (cm.credit_memo_lines || []).forEach((l) => {
-            if (!isShippableItem(l)) {
-                const desc = String(l?.description || '');
-                if (desc && skuByDescription[desc]) {
-                    const sku = skuByDescription[desc];
-                    returnedQtyBySku[sku] = (returnedQtyBySku[sku] || 0) + (l.quantity || 0);
-                }
+            const itemNo = String(l?.item_no || l?.no || '');
+            const desc = String(l?.description || '');
+            if (itemNo.toUpperCase() === 'X DELCHR' || itemNo.toUpperCase() === 'REFUND')
+                return;
+            if ((l?.quantity || 0) <= 0)
                 return;
+            const typeStr = String(l?.type || '').toLowerCase();
+            const isTypeItem = typeStr.includes('item');
+            if (isTypeItem) {
+                const variant = String(l?.variant_code || '');
+                const sku = variant ? `${itemNo}-${variant}` : itemNo;
+                returnedQtyBySku[sku] = (returnedQtyBySku[sku] || 0) + (l.quantity || 0);
+            }
+            else if (desc && skuByDescription[desc]) {
+                const sku = skuByDescription[desc];
+                returnedQtyBySku[sku] = (returnedQtyBySku[sku] || 0) + (l.quantity || 0);
             }
-            const itemNo = String(l?.item_no || l?.no || '');
-            const variant = String(l?.variant_code || '');
-            const sku = variant ? `${itemNo}-${variant}` : itemNo;
-            returnedQtyBySku[sku] = (returnedQtyBySku[sku] || 0) + (l.quantity || 0);
         });
     });
     (payload.sales || []).forEach((sale) => {
@@ -203,9 +200,14 @@ function transformMasterOrder(payload) {
         if (!docTypeRaw.toLowerCase().includes('return'))
             return;
         (sale.sale_lines || []).forEach((l) => {
-            if (!isShippableItem(l))
-                return;
             const itemNo = String(l?.item_no || l?.no || '');
+            const desc = String(l?.description || '');
+            if (itemNo.toUpperCase() === 'X DELCHR' || itemNo.toUpperCase() === 'REFUND')
+                return;
+            if ((l?.quantity || 0) <= 0)
+                return;
+            if (!isItemish(l?.type, itemNo, desc))
+                return;
             const variant = String(l?.variant_code || '');
             const sku = variant ? `${itemNo}-${variant}` : itemNo;
             returnedQtyBySku[sku] = (returnedQtyBySku[sku] || 0) + (l.quantity || 0);
@@ -235,12 +237,18 @@ function transformMasterOrder(payload) {
     const shippedQtyBySku = {};
     (payload.shipments || []).forEach((s) => {
         (s.shipment_lines || []).forEach((l) => {
-            if (!isShippableItem(l))
-                return;
             const itemNo = String(l?.item_no || l?.no || "");
+            if (itemNo.toUpperCase() === 'X DELCHR')
+                return;
+            const desc = String(l?.description || '');
+            const looksProduct = itemNo.includes('-') || desc.includes(' - ');
+            const qty = Number(l?.quantity || 0);
+            if (!looksProduct)
+                return;
+            if (qty <= 0)
+                return;
             const variant = String(l?.variant_code || "");
             const sku = variant ? `${itemNo}-${variant}` : itemNo;
-            const qty = Number(l?.quantity || 0);
             shippedQtyBySku[sku] = (shippedQtyBySku[sku] || 0) + qty;
         });
     });
@@ -511,30 +519,19 @@ function transformMasterOrder(payload) {
         const d = new Date(source.includes("T") ? source : `${source}T00:00:00Z`);
         return isNaN(d.getTime()) ? new Date().toISOString() : d.toISOString();
     };
-    const mapCourierName = (shippingAgentCode) => {
-        if (!shippingAgentCode || typeof shippingAgentCode !== 'string')
-            return null;
-        const code = shippingAgentCode.toUpperCase().trim();
-        if (code === 'GLOBALE' || code === 'ROYALMAIL' || code === 'EVRI' || code === 'WAITROSE') {
-            return code;
-        }
-        return null;
-    };
-    const mapClassName = (serviceCode) => {
-        if (!serviceCode || typeof serviceCode !== 'string')
-            return 'STANDARD';
-        const code = serviceCode.toUpperCase().trim();
-        if (code.includes('24') || code.includes('EXPRESS') || code.includes('PRIORITY')) {
-            return 'PRIORITY';
-        }
-        return 'STANDARD';
-    };
     const mappedShipments = (payload.shipments || []).map((s) => {
         const rawLines = (s.shipment_lines || [])
-            .filter((l) => isShippableItem(l));
+            .filter((l) => (l?.quantity ?? 0) > 0)
+            .filter((l) => String(l?.item_no || '').toUpperCase() !== 'X DELCHR')
+            .filter((l) => {
+            const itemNo = String(l?.item_no || '');
+            const desc = String(l?.description || '');
+            const looksProduct = itemNo.includes('-') || desc.includes(' - ');
+            return looksProduct;
+        });
         const qtyBySku = new Map();
         rawLines.forEach((l) => {
-            const itemNo = String(l?.item_no || l?.no || '');
+            const itemNo = String(l?.item_no || '');
             const variant = String(l?.variant_code || '');
             const sku = variant ? `${itemNo}-${variant}` : itemNo;
             const q = Number(l?.quantity || 0);
@@ -553,9 +550,6 @@ function transformMasterOrder(payload) {
             status: statusVal,
             type: statusVal === "SHIPPED" ? "SHIPPED-OUTBOUND" : undefined,
             shipped_by: "TORQUE",
-            courier_name: mapCourierName(s.shipping_agent_code),
-            tracking_code: (s.torque_tracking_id && typeof s.torque_tracking_id === 'string') ? s.torque_tracking_id : null,
-            class_name: mapClassName(s.shipping_agent_service_code),
             items: shipmentLines,
             amount_net: money(0),
             amount_gross: money(0),
@@ -564,27 +558,28 @@ function transformMasterOrder(payload) {
             discount_amount_percent: 0,
         };
     });
-    const shipmentsBySku = new Map();
-    (payload.shipments || []).forEach((s) => {
-        (s.shipment_lines || []).forEach((sl) => {
-            if (!isShippableItem(sl))
-                return;
-            const itemNo = String(sl?.item_no || sl?.no || '');
-            const variant = String(sl?.variant_code || '');
-            const sku = variant ? `${itemNo}-${variant}` : itemNo;
-            if (!shipmentsBySku.has(sku)) {
-                shipmentsBySku.set(sku, s);
-            }
-        });
-    });
     const returnShipments = (payload.credit_memos || [])
         .filter((cm) => {
         const lines = cm?.credit_memo_lines || [];
-        return lines.some((l) => isShippableItem(l));
+        return lines.some((l) => {
+            const itemNo = String(l?.item_no || l?.no || "");
+            const upper = itemNo.toUpperCase();
+            if (upper === 'X DELCHR' || upper === 'REFUND')
+                return false;
+            const looksProduct = itemNo.includes('-');
+            return (l?.quantity || 0) > 0 && looksProduct;
+        });
     })
         .map((cm, idx) => {
         const rawLines = (cm.credit_memo_lines || [])
-            .filter((l) => isShippableItem(l));
+            .filter((l) => (l?.quantity || 0) > 0)
+            .filter((l) => {
+            const itemNo = String(l?.item_no || l?.no || '');
+            const upper = itemNo.toUpperCase();
+            if (upper === 'X DELCHR' || upper === 'REFUND')
+                return false;
+            return itemNo.includes('-');
+        });
         const qtyBySku = new Map();
         rawLines.forEach((l) => {
             const itemNo = String(l?.item_no || l?.no || '');
@@ -594,7 +589,6 @@ function transformMasterOrder(payload) {
             qtyBySku.set(sku, (qtyBySku.get(sku) || 0) + q);
         });
         const skus = Array.from(qtyBySku.keys()).sort();
-        const matchingShipment = skus.length > 0 ? shipmentsBySku.get(skus[0]) : null;
         const lines = skus.map((sku, i) => ({
             lineNumber: i + 1,
             sku,
@@ -608,17 +602,6 @@ function transformMasterOrder(payload) {
             status: "RECEIVED",
             type: "SHIPPED-RETURN",
             shipped_by: "CUSTOMER",
-            courier_name: mapCourierName(matchingShipment?.shipping_agent_code || cm.shipping_agent_code),
-            tracking_code: (() => {
-                if (matchingShipment?.torque_tracking_id && typeof matchingShipment.torque_tracking_id === 'string') {
-                    return matchingShipment.torque_tracking_id;
-                }
-                if (cm.torque_tracking_id && typeof cm.torque_tracking_id === 'string') {
-                    return cm.torque_tracking_id;
-                }
-                return null;
-            })(),
-            class_name: mapClassName(matchingShipment?.shipping_agent_service_code || cm.shipping_agent_service_code),
             items: lines,
             amount_net: money(0),
             amount_gross: money(0),
@@ -783,7 +766,7 @@ function transformMasterOrder(payload) {
             return acc + (s.amount_incl_vat || 0);
         }
         const lineAmounts = (s.shipment_lines || []).reduce((lineAcc, l) => {
-            if (!isShippableItem(l))
+            if (isDeliveryItem(l))
                 return lineAcc;
             const orderLineNo = Number(l?.order_line_no || -1);
             let sourceLine = orderLineNo > 0 ? sourceLineMap.get(orderLineNo) : null;

package/dist/cjs/src-public/centra.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = __importDefault(require("crypto"));
 const env_1 = __importDefault(require("./env"));
 const utils_1 = require("./utils");
-const CACHE_EXPIRATION_MS = 1000 * 60 * 60 * 3;
+const CACHE_EXPIRATION_MS = 1000 * 60 * 5;
 class CentraHelper extends env_1.default {
     opts;
     shaToken;
@@ -99,6 +99,12 @@ class CentraHelper extends env_1.default {
     getCacheKeyForMarket(marketExternalId) {
         return `${this.getCacheKeyForMarkets()}_${marketExternalId}`;
     }
+    getCacheKeyForCampaigns() {
+        return `centra_${this.shaToken}_campaign_name`;
+    }
+    getCacheKeyForCampaign(campaignName) {
+        return `${this.getCacheKeyForCampaigns()}_${campaignName}`;
+    }
     getCacheKeyForSizeCharts() {
         return `centra_${this.shaToken}_size_chart_external_id`;
     }
@@ -130,7 +136,7 @@ class CentraHelper extends env_1.default {
         return `${this.getCacheKeyForCentraWarehouses()}_${warehouseExternalId}`;
     }
     getCacheKeyForCentraPricelists() {
-        return `centra_${this.shaToken}_pricelist_external_id`;
+        return `centra_${this.shaToken}_pricelists_external_id`;
     }
     getCacheKeyForCentraPricelist(pricelistExternalId) {
         return `${this.getCacheKeyForCentraPricelists()}_${pricelistExternalId}`;
@@ -218,7 +224,7 @@ class CentraHelper extends env_1.default {
         return result;
     }
     async fetchCentraCampaigns(names) {
-        const limit = (names?.length || 0) > 200 ? 200 : (names?.length || 0);
+        const limit = names ? (names.length > 200 ? 200 : names.length) : 200;
         let nextCursor = null;
         const result = {};
         do {
@@ -270,7 +276,7 @@ class CentraHelper extends env_1.default {
                     nextCursor = null;
                 }
                 if (campaignConnection && campaignConnection.edges?.length) {
-                    for (let i = campaignConnection.edges.length; i < (names?.length || 0); i++) {
+                    for (let i = 0; i < campaignConnection.edges.length; i++) {
                         const { node } = campaignConnection.edges[i];
                         result[node.name] = node;
                     }
@@ -721,7 +727,9 @@ class CentraHelper extends env_1.default {
             }
             else {
                 for (const warehouse of warehouses) {
-                    warehouseToSet[warehouse.externalId] = warehouse;
+                    if (warehouse.externalId) {
+                        warehouseToSet[warehouse.externalId] = warehouse;
+                    }
                 }
                 await this.set(Object.entries(warehouseToSet).filter(([_, value]) => !(value instanceof Error)).map(([key, value]) => ({ name: this.getCacheKeyForCentraWarehouse(key), value: JSON.stringify(value) })), 'env', {
                     ephemeralMs: CACHE_EXPIRATION_MS,
@@ -797,6 +805,49 @@ class CentraHelper extends env_1.default {
         }
         return Object.assign({}, pricelistInCache, pricelistToSet);
     }
+    async getCentraCampaigns(alwaysFetch = false) {
+        let campaignInCache = {};
+        let dedupedCampaignNamesInCache = [];
+        let campaignsToFetch = null;
+        if (!alwaysFetch) {
+            const campaignNamesInCache = await (this.get(this.getCacheKeyForCampaigns(), 'env', {
+                isEphemeral: true,
+                encrypted: false,
+            }).then(x => x ? JSON.parse(x) : null));
+            if (campaignNamesInCache) {
+                dedupedCampaignNamesInCache = campaignNamesInCache.filter((x, index, self) => self.indexOf(x) === index);
+                campaignInCache = Object.fromEntries(Object.entries(await this.get(dedupedCampaignNamesInCache.map((x) => this.getCacheKeyForCampaign(x)), 'env', {
+                    isEphemeral: true,
+                    encrypted: false,
+                })).map(([key, value]) => [key, value ? JSON.parse(value || 'null') : undefined]).filter(([_, value]) => value));
+                campaignsToFetch = dedupedCampaignNamesInCache.filter(x => !campaignInCache[x]);
+            }
+        }
+        const campaignToSet = {};
+        if (!campaignsToFetch || campaignsToFetch.length) {
+            const campaigns = await this.fetchCentraCampaigns();
+            if (CentraHelper.isCentraErrors(campaigns)) {
+                return new Error(`Failed to fetch campaigns: ${campaigns.errors.map((x) => x.message).join(', ')}`);
+            }
+            else {
+                for (const campaign of Object.values(campaigns)) {
+                    campaignToSet[campaign.name] = campaign;
+                }
+                await this.set(Object.entries(campaignToSet).filter(([_, value]) => !(value instanceof Error)).map(([key, value]) => ({ name: this.getCacheKeyForCampaign(key), value: JSON.stringify(value) })), 'env', {
+                    ephemeralMs: CACHE_EXPIRATION_MS,
+                    encrypted: false,
+                });
+                await this.set([{
+                        name: this.getCacheKeyForCampaigns(),
+                        value: JSON.stringify(Object.keys(campaignToSet)),
+                    }], 'env', {
+                    ephemeralMs: CACHE_EXPIRATION_MS,
+                    encrypted: false,
+                });
+            }
+        }
+        return Object.assign({}, campaignInCache, campaignToSet);
+    }
     async getCentraMarkets(alwaysFetch = false) {
         let marketInCache = {};
         let dedupedMarketNamesInCache = [];

package/dist/cjs/src-public/env.js

@@ -567,7 +567,7 @@ class EnvEngine extends runtime_1.default {
             batchSize: 1,
             subscriptionFilter: null,
             batchWindowSeconds: 10,
-        }, Object.fromEntries(Object.entries(rnPartialConfig).filter(x => !(x === null || x === undefined))));
+        }, Object.fromEntries(Object.entries(rnPartialConfig).filter(([x]) => !(x === null || x === undefined))));
         return rnConfig;
     }
     createOrUpdateRespectfulNudge(subscriptionName, rnPartialConfig) {

package/dist/cjs/src-public/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisConnectionError = exports.RateLimit = exports.setHeaders = exports.BCOrderHelper = exports.DatoHelper = exports.AirtableHelper = exports.CentraHelper = exports.BigQueryHelper = exports.JWKSHelper = exports.CloudTasksHelper = exports.Secrets = exports.SchedulerHelper = exports.Logging = exports.Runtime = exports.PubSubHelper = exports.EnvEngine = exports.validate = void 0;
+exports.SitooHelper = exports.RedisConnectionError = exports.RateLimit = exports.setHeaders = exports.BCOrderHelper = exports.DatoHelper = exports.AirtableHelper = exports.CentraHelper = exports.BigQueryHelper = exports.JWKSHelper = exports.CloudTasksHelper = exports.Secrets = exports.SchedulerHelper = exports.Logging = exports.Runtime = exports.PubSubHelper = exports.EnvEngine = exports.validate = void 0;
 var validate_1 = require("./validate");
 Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return __importDefault(validate_1).default; } });
 __exportStar(require("./sanitize"), exports);
@@ -52,3 +52,5 @@ Object.defineProperty(exports, "setHeaders", { enumerable: true, get: function (
 var rateLimit_1 = require("./rateLimit");
 Object.defineProperty(exports, "RateLimit", { enumerable: true, get: function () { return __importDefault(rateLimit_1).default; } });
 Object.defineProperty(exports, "RedisConnectionError", { enumerable: true, get: function () { return rateLimit_1.RedisConnectionError; } });
+var sitoo_1 = require("./sitoo");
+Object.defineProperty(exports, "SitooHelper", { enumerable: true, get: function () { return __importDefault(sitoo_1).default; } });

package/dist/cjs/src-public/pubsub.js

@@ -79,19 +79,44 @@ class PubSubHelper extends runtime_1.default {
         }
         const topic = pubSubPublishTopics[options.topicName];
         const batches = payloads.length > 5 ? (0, lodash_chunk_1.default)(payloads, 10) : [payloads];
-        const attributes = {
-            ...options.extraAttributes,
-            source_system: options.sourceSystem,
-            target_system: options.targetSystem,
-            buildship_id: this.systemEnvName + '-' + this.workflowId + '-' + this.triggerId,
-        };
+        let nextAttributes = {};
         const messageIds = [];
         for (let i = 0; i < batches.length; i++) {
             const batch = batches[i];
-            const results = await Promise.allSettled(batch.map((x) => topic.publishMessage({
-                data: Buffer.from(JSON.stringify(x)),
-                attributes: Object.fromEntries(Object.entries(options.attributesGenerator ? Object.assign({}, attributes, options.attributesGenerator(x)) : attributes).filter(([_, v]) => v !== undefined && v !== null).map(([k, v]) => [k, `${v}`]))
-            })));
+            const results = await Promise.allSettled(batch.map((x) => {
+                if (options.attributesGenerator) {
+                    nextAttributes = Object.fromEntries(Object.entries(options.attributesGenerator(x)).filter(([_, v]) => v !== undefined && v !== null).map(([k, v]) => [k, typeof v === 'boolean' ? (v ? 'yes' : 'no') : `${v}`]));
+                }
+                if (typeof options.extraAttributes === 'function') {
+                    nextAttributes = Object.fromEntries(Object.entries(options.extraAttributes ? Object.assign({}, nextAttributes, options.extraAttributes(x)) : nextAttributes).filter(([_, v]) => v !== undefined && v !== null).map(([k, v]) => [k, typeof v === 'boolean' ? (v ? 'yes' : 'no') : `${v}`]));
+                }
+                else if (typeof options.extraAttributes === 'object') {
+                    for (const key in options.extraAttributes) {
+                        let resultForKey;
+                        if (typeof options.extraAttributes[key] === 'function') {
+                            resultForKey = options.extraAttributes[key](x);
+                        }
+                        else {
+                            resultForKey = options.extraAttributes[key];
+                        }
+                        if (typeof resultForKey === 'boolean') {
+                            nextAttributes[key] = resultForKey ? 'yes' : 'no';
+                        }
+                        else {
+                            nextAttributes[key] = `${resultForKey}`;
+                        }
+                    }
+                    nextAttributes = Object.assign(nextAttributes, {
+                        source_system: options.sourceSystem,
+                        target_system: options.targetSystem,
+                        buildship_id: this.systemEnvName + '-' + this.workflowId + '-' + this.triggerId,
+                    });
+                }
+                return topic.publishMessage({
+                    data: Buffer.from(JSON.stringify(x)),
+                    attributes: nextAttributes
+                });
+            }));
             for (const result of results) {
                 if (result.status === 'fulfilled') {
                     messageIds.push(result.value);