@shushed/helpers 0.0.227 → 0.0.229

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

@@ -83,35 +83,36 @@ class PubSubHelper extends runtime_1.default {
         const messageIds = [];
         for (let i = 0; i < batches.length; i++) {
             const batch = batches[i];
-            const results = await Promise.allSettled(batch.map((x) => {
+            const results = await Promise.allSettled(batch.map((x, index) => {
                 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}`]));
+                    nextAttributes = Object.fromEntries(Object.entries(options.attributesGenerator(x, index)).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}`]));
+                    nextAttributes = Object.fromEntries(Object.entries(options.extraAttributes ? Object.assign({}, nextAttributes, options.extraAttributes(x, index)) : 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, options.extraAttributes);
+                }
+                for (const key in nextAttributes) {
+                    let resultForKey;
+                    if (typeof nextAttributes[key] === 'function') {
+                        resultForKey = nextAttributes[key](x, index);
+                    }
+                    else {
+                        resultForKey = nextAttributes[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,
-                    });
                 }
+                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

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

@@ -97,7 +97,7 @@ class Runtime {
             this.workflowId = opts.workflowId || opts.workflow?.id || '';
             if (opts.trigger?.label) {
                 this.triggerId = opts.trigger.id || '00000000-0000-0000-0000-000000000000';
-                this.triggerName = opts.trigger.label.split(/\sv\d/)[0].trim() || this.workflowId;
+                this.triggerName = opts.trigger?.label?.split(/\sv\d/)[0]?.trim() || this.workflowId;
                 this.triggerVersion = buildSemver((opts.trigger.label.split(/\sv\d/)[1]?.trim() || 'v0').replace(/^v/, ''));
                 this.triggerDataProperties = opts.trigger.data?.properties;
                 this.triggerConfigProperties = opts.trigger.config?.properties;

package/dist/types/src-public/pubsub.d.ts

@@ -5,7 +5,7 @@ declare global {
     var HUSH_PUBSUB_PUBLISH_TOPICS: Record<string, Topic>;
 }
 export declare function isSubscriptionBigQuery(opts: SubscriptionOptionsBigQuery | SubscriptionOptionsPull): opts is SubscriptionOptionsBigQuery;
-type PublishAttributesGenerator<T> = (payload: any) => T;
+type PublishAttributesGenerator<T> = (payload: any, index: number) => T;
 type PublishAttributes = PublishAttributesGenerator<Record<string, string>> | Record<string, string> | Record<string, PublishAttributesGenerator<string | boolean | number> | boolean | number>;
 export type Message = {
     buildshipId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.227",
+  "version": "0.0.229",
   "author": "",
   "license": "UNLICENSED",
   "description": "",