@lucianpacurar/iso20022.js 0.2.12 → 0.2.13

package/dist/index.d.ts

@@ -889,6 +889,8 @@ interface SEPAMultiCreditPaymentInstructionGroup {
     payments: AtLeastOne$4<SEPACreditPaymentInstruction>;
     /** Optional category purpose code for this payment information block. */
     categoryPurpose?: ExternalCategoryPurpose;
+    /** Indicates whether transactions should be booked in batch. Defaults to false. */
+    batchBooking?: boolean;
 }
 /**
  * Configuration for SEPA Multi Credit Payment Initiation.
@@ -938,7 +940,6 @@ declare class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
     messageId: string;
     creationDate: Date;
     paymentInstructions: AtLeastOne$4<SEPAMultiCreditPaymentInstructionGroup>;
-    paymentInformationIdBase: string;
     private formattedPaymentSum;
     private totalTransactionCount;
     /**
@@ -1382,7 +1383,6 @@ declare class SEPADirectDebitPaymentInitiation extends PaymentInitiation {
     messageId: string;
     creationDate: Date;
     paymentInstructions: AtLeastOne$1<SEPADirectDebitPaymentInstructionGroup>;
-    paymentInformationIdBase: string;
     private formattedPaymentSum;
     private totalTransactionCount;
     /**

package/dist/index.js

@@ -2063,59 +2063,6 @@ var fxp = {
   XMLBuilder: XMLBuilder
 };
 
-/**
- * Convert array of 16 byte values to UUID string format of the form:
- * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
- */
-var byteToHex = [];
-for (var i = 0; i < 256; ++i) {
-  byteToHex.push((i + 0x100).toString(16).slice(1));
-}
-function unsafeStringify(arr, offset = 0) {
-  // Note: Be careful editing this code!  It's been tuned for performance
-  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
-  //
-  // Note to future-self: No, you can't remove the `toLowerCase()` call.
-  // REF: https://github.com/uuidjs/uuid/pull/677#issuecomment-1757351351
-  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
-}
-
-// Unique ID creation requires a high quality random # generator. In the browser we therefore
-// require the crypto API and do not support built-in fallback to lower quality random number
-// generators (like Math.random()).
-
-var getRandomValues;
-var rnds8 = new Uint8Array(16);
-function rng() {
-  // lazy load so that environments that need to polyfill have a chance to do so
-  if (!getRandomValues) {
-    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation.
-    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto);
-    if (!getRandomValues) {
-      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
-    }
-  }
-  return getRandomValues(rnds8);
-}
-
-var randomUUID = typeof crypto !== 'undefined' && crypto.randomUUID && crypto.randomUUID.bind(crypto);
-var native = {
-  randomUUID
-};
-
-function v4(options, buf, offset) {
-  if (native.randomUUID && !buf && !options) {
-    return native.randomUUID();
-  }
-  options = options || {};
-  var rnds = options.random || (options.rng || rng)();
-
-  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
-  rnds[6] = rnds[6] & 0x0f | 0x40;
-  rnds[8] = rnds[8] & 0x3f | 0x80;
-  return unsafeStringify(rnds);
-}
-
 /**
  * Base error class for all ISO 20022 related errors in the library.
  * Extends the native Error class with proper stack trace capture.
@@ -7278,9 +7225,65 @@ const exportMessageHeader = (header) => {
     return obj;
 };
 
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+var byteToHex = [];
+for (var i = 0; i < 256; ++i) {
+  byteToHex.push((i + 0x100).toString(16).slice(1));
+}
+function unsafeStringify(arr, offset = 0) {
+  // Note: Be careful editing this code!  It's been tuned for performance
+  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
+  //
+  // Note to future-self: No, you can't remove the `toLowerCase()` call.
+  // REF: https://github.com/uuidjs/uuid/pull/677#issuecomment-1757351351
+  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+}
+
+// Unique ID creation requires a high quality random # generator. In the browser we therefore
+// require the crypto API and do not support built-in fallback to lower quality random number
+// generators (like Math.random()).
+
+var getRandomValues;
+var rnds8 = new Uint8Array(16);
+function rng() {
+  // lazy load so that environments that need to polyfill have a chance to do so
+  if (!getRandomValues) {
+    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation.
+    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto);
+    if (!getRandomValues) {
+      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+    }
+  }
+  return getRandomValues(rnds8);
+}
+
+var randomUUID = typeof crypto !== 'undefined' && crypto.randomUUID && crypto.randomUUID.bind(crypto);
+var native = {
+  randomUUID
+};
+
+function v4(options, buf, offset) {
+  if (native.randomUUID && !buf && !options) {
+    return native.randomUUID();
+  }
+  options = options || {};
+  var rnds = options.random || (options.rng || rng)();
+
+  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+  rnds[6] = rnds[6] & 0x0f | 0x40;
+  rnds[8] = rnds[8] & 0x3f | 0x80;
+  return unsafeStringify(rnds);
+}
+
 const sanitize = (value, length) => {
     return value.slice(0, length);
 };
+const generateId = () => {
+    return v4().replace(/-/g, '');
+};
 
 /**
  * Abstract base class for ISO20022 payment initiation (PAIN) messages.
@@ -7446,10 +7449,9 @@ class SWIFTCreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'swift' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId =
-            config.messageId || v4().replace(/-/g, '').substring(0, 35);
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationId = sanitize(v4(), 35);
+        this.paymentInformationId = generateId();
         this.validate();
     }
     /**
@@ -7479,7 +7481,7 @@ class SWIFTCreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The credit transfer object.
      */
     creditTransfer(paymentInstruction) {
-        const paymentInstructionId = sanitize(paymentInstruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(paymentInstruction.id || generateId(), 35);
         const amount = Dinero({
             amount: paymentInstruction.amount,
             currency: paymentInstruction.currency,
@@ -7665,10 +7667,10 @@ class SEPACreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'sepa' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
         this.formattedPaymentSum = this.sumPaymentInstructions(this.paymentInstructions);
-        this.paymentInformationId = sanitize(v4(), 35);
+        this.paymentInformationId = generateId();
         this.categoryPurpose = config.categoryPurpose;
         this.validate();
     }
@@ -7718,8 +7720,8 @@ class SEPACreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to SEPA specifications.
      */
     creditTransfer(instruction) {
-        const paymentInstructionId = sanitize(instruction.id || v4(), 35);
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(instruction.id || generateId(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -7928,7 +7930,6 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
     messageId;
     creationDate;
     paymentInstructions;
-    paymentInformationIdBase;
     formattedPaymentSum;
     totalTransactionCount;
     /**
@@ -7939,9 +7940,8 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'sepa' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationIdBase = sanitize(v4(), 35);
         this.totalTransactionCount = this.countAllTransactions();
         this.formattedPaymentSum = this.sumAllPayments();
         this.validate();
@@ -8011,8 +8011,8 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to SEPA specifications.
      */
     creditTransfer(instruction) {
-        const paymentInstructionId = sanitize(instruction.id || v4(), 35);
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(instruction.id || generateId(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -8050,17 +8050,19 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
     serialize() {
         const builder = PaymentInitiation.getBuilder();
         // Generate one PmtInf entry per individual payment
-        const paymentInfoEntries = this.paymentInstructions.flatMap((group, groupIndex) => {
-            return group.payments.map((payment, paymentIndex) => {
+        const paymentInfoEntries = this.paymentInstructions.flatMap((group) => {
+            return group.payments.map((payment) => {
                 const dinero = Dinero({
                     amount: payment.amount,
                     currency: payment.currency,
                 });
-                const pmtInfId = sanitize(`${this.paymentInformationIdBase}-${groupIndex + 1}-${paymentIndex + 1}`, 35);
+                const pmtInfId = generateId();
                 const requestedExecutionDate = payment.requestedPaymentExecutionDate || new Date();
+                const batchBooking = group.batchBooking !== undefined ? group.batchBooking : false;
                 return {
                     PmtInfId: pmtInfId,
                     PmtMtd: 'TRF',
+                    BtchBookg: batchBooking,
                     NbOfTxs: '1',
                     CtrlSum: dinero.toFormat('0.00'),
                     PmtTpInf: {
@@ -8223,10 +8225,13 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
                     }),
                 };
             });
+            // Extract batch booking
+            const batchBooking = pmtInf.BtchBookg === 'true' || pmtInf.BtchBookg === true;
             return {
                 initiatingParty: groupInitiatingParty,
                 payments: payments,
                 ...(categoryPurpose && { categoryPurpose }),
+                batchBooking: batchBooking,
             };
         });
         // Return new instance
@@ -8271,9 +8276,9 @@ class RTPCreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'rtp' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationId = sanitize(v4(), 35);
+        this.paymentInformationId = generateId();
         this.formattedPaymentSum = this.sumPaymentInstructions(this.paymentInstructions);
         this.validate();
     }
@@ -8310,8 +8315,8 @@ class RTPCreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to SEPA specifications.
      */
     creditTransfer(instruction) {
-        const paymentInstructionId = sanitize(instruction.id || v4(), 35);
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(instruction.id || generateId(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -8586,9 +8591,9 @@ class ACHCreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'ach' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationId = sanitize(v4(), 35);
+        this.paymentInformationId = generateId();
         this.localInstrument =
             config.localInstrument || ACHLocalInstrumentCode.CorporateCreditDebit;
         this.serviceLevel = 'NURG'; // Normal Urgency
@@ -8635,8 +8640,8 @@ class ACHCreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to ACH specifications.
      */
     creditTransfer(instruction) {
-        const paymentInstructionId = sanitize(instruction.id || v4(), 35);
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(instruction.id || generateId(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -8859,7 +8864,6 @@ class SEPADirectDebitPaymentInitiation extends PaymentInitiation {
     messageId;
     creationDate;
     paymentInstructions;
-    paymentInformationIdBase;
     formattedPaymentSum;
     totalTransactionCount;
     /**
@@ -8870,9 +8874,8 @@ class SEPADirectDebitPaymentInitiation extends PaymentInitiation {
         super({ type: 'sepa' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationIdBase = sanitize(v4(), 35);
         this.totalTransactionCount = this.countAllTransactions();
         this.formattedPaymentSum = this.sumAllPayments();
         this.validate();
@@ -8942,7 +8945,7 @@ class SEPADirectDebitPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to SEPA direct debit specifications.
      */
     directDebitTransfer(instruction) {
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -9012,8 +9015,8 @@ class SEPADirectDebitPaymentInitiation extends PaymentInitiation {
     serialize() {
         const builder = PaymentInitiation.getBuilder();
         // Generate one PmtInf entry per creditor group
-        const paymentInfoEntries = this.paymentInstructions.map((group, groupIndex) => {
-            const pmtInfId = sanitize(`${this.paymentInformationIdBase}-${groupIndex + 1}`, 35);
+        const paymentInfoEntries = this.paymentInstructions.map((group) => {
+            const pmtInfId = generateId();
             const localInstrument = group.localInstrument || 'CORE';
             const batchBooking = group.batchBooking !== undefined ? group.batchBooking : false;
             // Calculate sum for this group

package/dist/index.mjs

@@ -2061,59 +2061,6 @@ var fxp = {
   XMLBuilder: XMLBuilder
 };
 
-/**
- * Convert array of 16 byte values to UUID string format of the form:
- * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
- */
-var byteToHex = [];
-for (var i = 0; i < 256; ++i) {
-  byteToHex.push((i + 0x100).toString(16).slice(1));
-}
-function unsafeStringify(arr, offset = 0) {
-  // Note: Be careful editing this code!  It's been tuned for performance
-  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
-  //
-  // Note to future-self: No, you can't remove the `toLowerCase()` call.
-  // REF: https://github.com/uuidjs/uuid/pull/677#issuecomment-1757351351
-  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
-}
-
-// Unique ID creation requires a high quality random # generator. In the browser we therefore
-// require the crypto API and do not support built-in fallback to lower quality random number
-// generators (like Math.random()).
-
-var getRandomValues;
-var rnds8 = new Uint8Array(16);
-function rng() {
-  // lazy load so that environments that need to polyfill have a chance to do so
-  if (!getRandomValues) {
-    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation.
-    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto);
-    if (!getRandomValues) {
-      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
-    }
-  }
-  return getRandomValues(rnds8);
-}
-
-var randomUUID = typeof crypto !== 'undefined' && crypto.randomUUID && crypto.randomUUID.bind(crypto);
-var native = {
-  randomUUID
-};
-
-function v4(options, buf, offset) {
-  if (native.randomUUID && !buf && !options) {
-    return native.randomUUID();
-  }
-  options = options || {};
-  var rnds = options.random || (options.rng || rng)();
-
-  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
-  rnds[6] = rnds[6] & 0x0f | 0x40;
-  rnds[8] = rnds[8] & 0x3f | 0x80;
-  return unsafeStringify(rnds);
-}
-
 /**
  * Base error class for all ISO 20022 related errors in the library.
  * Extends the native Error class with proper stack trace capture.
@@ -7276,9 +7223,65 @@ const exportMessageHeader = (header) => {
     return obj;
 };
 
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+var byteToHex = [];
+for (var i = 0; i < 256; ++i) {
+  byteToHex.push((i + 0x100).toString(16).slice(1));
+}
+function unsafeStringify(arr, offset = 0) {
+  // Note: Be careful editing this code!  It's been tuned for performance
+  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
+  //
+  // Note to future-self: No, you can't remove the `toLowerCase()` call.
+  // REF: https://github.com/uuidjs/uuid/pull/677#issuecomment-1757351351
+  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+}
+
+// Unique ID creation requires a high quality random # generator. In the browser we therefore
+// require the crypto API and do not support built-in fallback to lower quality random number
+// generators (like Math.random()).
+
+var getRandomValues;
+var rnds8 = new Uint8Array(16);
+function rng() {
+  // lazy load so that environments that need to polyfill have a chance to do so
+  if (!getRandomValues) {
+    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation.
+    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto);
+    if (!getRandomValues) {
+      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+    }
+  }
+  return getRandomValues(rnds8);
+}
+
+var randomUUID = typeof crypto !== 'undefined' && crypto.randomUUID && crypto.randomUUID.bind(crypto);
+var native = {
+  randomUUID
+};
+
+function v4(options, buf, offset) {
+  if (native.randomUUID && !buf && !options) {
+    return native.randomUUID();
+  }
+  options = options || {};
+  var rnds = options.random || (options.rng || rng)();
+
+  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+  rnds[6] = rnds[6] & 0x0f | 0x40;
+  rnds[8] = rnds[8] & 0x3f | 0x80;
+  return unsafeStringify(rnds);
+}
+
 const sanitize = (value, length) => {
     return value.slice(0, length);
 };
+const generateId = () => {
+    return v4().replace(/-/g, '');
+};
 
 /**
  * Abstract base class for ISO20022 payment initiation (PAIN) messages.
@@ -7444,10 +7447,9 @@ class SWIFTCreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'swift' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId =
-            config.messageId || v4().replace(/-/g, '').substring(0, 35);
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationId = sanitize(v4(), 35);
+        this.paymentInformationId = generateId();
         this.validate();
     }
     /**
@@ -7477,7 +7479,7 @@ class SWIFTCreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The credit transfer object.
      */
     creditTransfer(paymentInstruction) {
-        const paymentInstructionId = sanitize(paymentInstruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(paymentInstruction.id || generateId(), 35);
         const amount = Dinero({
             amount: paymentInstruction.amount,
             currency: paymentInstruction.currency,
@@ -7663,10 +7665,10 @@ class SEPACreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'sepa' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
         this.formattedPaymentSum = this.sumPaymentInstructions(this.paymentInstructions);
-        this.paymentInformationId = sanitize(v4(), 35);
+        this.paymentInformationId = generateId();
         this.categoryPurpose = config.categoryPurpose;
         this.validate();
     }
@@ -7716,8 +7718,8 @@ class SEPACreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to SEPA specifications.
      */
     creditTransfer(instruction) {
-        const paymentInstructionId = sanitize(instruction.id || v4(), 35);
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(instruction.id || generateId(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -7926,7 +7928,6 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
     messageId;
     creationDate;
     paymentInstructions;
-    paymentInformationIdBase;
     formattedPaymentSum;
     totalTransactionCount;
     /**
@@ -7937,9 +7938,8 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'sepa' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationIdBase = sanitize(v4(), 35);
         this.totalTransactionCount = this.countAllTransactions();
         this.formattedPaymentSum = this.sumAllPayments();
         this.validate();
@@ -8009,8 +8009,8 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to SEPA specifications.
      */
     creditTransfer(instruction) {
-        const paymentInstructionId = sanitize(instruction.id || v4(), 35);
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(instruction.id || generateId(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -8048,17 +8048,19 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
     serialize() {
         const builder = PaymentInitiation.getBuilder();
         // Generate one PmtInf entry per individual payment
-        const paymentInfoEntries = this.paymentInstructions.flatMap((group, groupIndex) => {
-            return group.payments.map((payment, paymentIndex) => {
+        const paymentInfoEntries = this.paymentInstructions.flatMap((group) => {
+            return group.payments.map((payment) => {
                 const dinero = Dinero({
                     amount: payment.amount,
                     currency: payment.currency,
                 });
-                const pmtInfId = sanitize(`${this.paymentInformationIdBase}-${groupIndex + 1}-${paymentIndex + 1}`, 35);
+                const pmtInfId = generateId();
                 const requestedExecutionDate = payment.requestedPaymentExecutionDate || new Date();
+                const batchBooking = group.batchBooking !== undefined ? group.batchBooking : false;
                 return {
                     PmtInfId: pmtInfId,
                     PmtMtd: 'TRF',
+                    BtchBookg: batchBooking,
                     NbOfTxs: '1',
                     CtrlSum: dinero.toFormat('0.00'),
                     PmtTpInf: {
@@ -8221,10 +8223,13 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
                     }),
                 };
             });
+            // Extract batch booking
+            const batchBooking = pmtInf.BtchBookg === 'true' || pmtInf.BtchBookg === true;
             return {
                 initiatingParty: groupInitiatingParty,
                 payments: payments,
                 ...(categoryPurpose && { categoryPurpose }),
+                batchBooking: batchBooking,
             };
         });
         // Return new instance
@@ -8269,9 +8274,9 @@ class RTPCreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'rtp' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationId = sanitize(v4(), 35);
+        this.paymentInformationId = generateId();
         this.formattedPaymentSum = this.sumPaymentInstructions(this.paymentInstructions);
         this.validate();
     }
@@ -8308,8 +8313,8 @@ class RTPCreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to SEPA specifications.
      */
     creditTransfer(instruction) {
-        const paymentInstructionId = sanitize(instruction.id || v4(), 35);
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(instruction.id || generateId(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -8584,9 +8589,9 @@ class ACHCreditPaymentInitiation extends PaymentInitiation {
         super({ type: 'ach' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationId = sanitize(v4(), 35);
+        this.paymentInformationId = generateId();
         this.localInstrument =
             config.localInstrument || ACHLocalInstrumentCode.CorporateCreditDebit;
         this.serviceLevel = 'NURG'; // Normal Urgency
@@ -8633,8 +8638,8 @@ class ACHCreditPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to ACH specifications.
      */
     creditTransfer(instruction) {
-        const paymentInstructionId = sanitize(instruction.id || v4(), 35);
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const paymentInstructionId = sanitize(instruction.id || generateId(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -8857,7 +8862,6 @@ class SEPADirectDebitPaymentInitiation extends PaymentInitiation {
     messageId;
     creationDate;
     paymentInstructions;
-    paymentInformationIdBase;
     formattedPaymentSum;
     totalTransactionCount;
     /**
@@ -8868,9 +8872,8 @@ class SEPADirectDebitPaymentInitiation extends PaymentInitiation {
         super({ type: 'sepa' });
         this.initiatingParty = config.initiatingParty;
         this.paymentInstructions = config.paymentInstructions;
-        this.messageId = config.messageId || v4().replace(/-/g, '');
+        this.messageId = config.messageId || generateId();
         this.creationDate = config.creationDate || new Date();
-        this.paymentInformationIdBase = sanitize(v4(), 35);
         this.totalTransactionCount = this.countAllTransactions();
         this.formattedPaymentSum = this.sumAllPayments();
         this.validate();
@@ -8940,7 +8943,7 @@ class SEPADirectDebitPaymentInitiation extends PaymentInitiation {
      * @returns {Object} The payment information object formatted according to SEPA direct debit specifications.
      */
     directDebitTransfer(instruction) {
-        const endToEndId = sanitize(instruction.endToEndId || instruction.id || v4(), 35);
+        const endToEndId = sanitize(instruction.endToEndId || instruction.id || generateId(), 35);
         const dinero = Dinero({
             amount: instruction.amount,
             currency: instruction.currency,
@@ -9010,8 +9013,8 @@ class SEPADirectDebitPaymentInitiation extends PaymentInitiation {
     serialize() {
         const builder = PaymentInitiation.getBuilder();
         // Generate one PmtInf entry per creditor group
-        const paymentInfoEntries = this.paymentInstructions.map((group, groupIndex) => {
-            const pmtInfId = sanitize(`${this.paymentInformationIdBase}-${groupIndex + 1}`, 35);
+        const paymentInfoEntries = this.paymentInstructions.map((group) => {
+            const pmtInfId = generateId();
             const localInstrument = group.localInstrument || 'CORE';
             const batchBooking = group.batchBooking !== undefined ? group.batchBooking : false;
             // Calculate sum for this group

package/dist/src/pain/001/sepa-multi-credit-payment-initiation.d.ts

@@ -15,6 +15,8 @@ export interface SEPAMultiCreditPaymentInstructionGroup {
     payments: AtLeastOne<SEPACreditPaymentInstruction>;
     /** Optional category purpose code for this payment information block. */
     categoryPurpose?: ExternalCategoryPurpose;
+    /** Indicates whether transactions should be booked in batch. Defaults to false. */
+    batchBooking?: boolean;
 }
 /**
  * Configuration for SEPA Multi Credit Payment Initiation.
@@ -64,7 +66,6 @@ export declare class SEPAMultiCreditPaymentInitiation extends PaymentInitiation
     messageId: string;
     creationDate: Date;
     paymentInstructions: AtLeastOne<SEPAMultiCreditPaymentInstructionGroup>;
-    paymentInformationIdBase: string;
     private formattedPaymentSum;
     private totalTransactionCount;
     /**

package/dist/src/pain/008/sepa-direct-debit-payment-initiation.d.ts

@@ -78,7 +78,6 @@ export declare class SEPADirectDebitPaymentInitiation extends PaymentInitiation
     messageId: string;
     creationDate: Date;
     paymentInstructions: AtLeastOne<SEPADirectDebitPaymentInstructionGroup>;
-    paymentInformationIdBase: string;
     private formattedPaymentSum;
     private totalTransactionCount;
     /**

package/dist/src/utils/format.d.ts

@@ -1 +1,2 @@
 export declare const sanitize: (value: string, length: 35) => string;
+export declare const generateId: () => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucianpacurar/iso20022.js",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "readme": "README.md",
   "description": "Library to create payment messages.",
   "main": "dist/index.js",