@lucianpacurar/iso20022.js 0.2.8 → 0.2.10

package/dist/index.d.ts

@@ -293,6 +293,8 @@ interface SWIFTCreditPaymentInstruction extends CreditPaymentInstruction {
 interface SEPACreditPaymentInstruction extends CreditPaymentInstruction {
     type?: 'sepa';
     currency: 'EUR';
+    /** Optional requested payment execution date. If not provided, defaults to current date. */
+    requestedPaymentExecutionDate?: Date;
 }
 interface RTPCreditPaymentInstruction extends CreditPaymentInstruction {
     type?: 'rtp';
@@ -900,14 +902,6 @@ declare class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
      * @returns {string} The total sum formatted as a string with 2 decimal places.
      */
     private sumAllPayments;
-    /**
-     * Calculates the sum of payment instructions for a single group.
-     * @private
-     * @param {AtLeastOne<SEPACreditPaymentInstruction>} payments - Array of payment instructions.
-     * @returns {string} The total sum formatted as a string with 2 decimal places.
-     * @throws {Error} If payment instructions have different currencies.
-     */
-    private sumPaymentInstructions;
     /**
      * Validates the payment initiation data according to SEPA requirements.
      * @private

package/dist/index.js

@@ -7746,13 +7746,15 @@ class SEPACreditPaymentInitiation extends PaymentInitiation {
                         CtrlSum: this.formattedPaymentSum,
                         InitgPty: {
                             Nm: this.initiatingParty.name,
-                            Id: {
-                                OrgId: {
-                                    Othr: {
-                                        Id: this.initiatingParty.id,
+                            ...(this.initiatingParty.id && {
+                                Id: {
+                                    OrgId: {
+                                        Othr: {
+                                            Id: this.initiatingParty.id,
+                                        },
                                     },
                                 },
-                            },
+                            }),
                         },
                     },
                     PmtInf: {
@@ -7919,20 +7921,6 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
         }
         return Dinero({ amount: totalAmount, currency }).toFormat('0.00');
     }
-    /**
-     * Calculates the sum of payment instructions for a single group.
-     * @private
-     * @param {AtLeastOne<SEPACreditPaymentInstruction>} payments - Array of payment instructions.
-     * @returns {string} The total sum formatted as a string with 2 decimal places.
-     * @throws {Error} If payment instructions have different currencies.
-     */
-    sumPaymentInstructions(payments) {
-        this.validateGroupInstructionsHaveSameCurrency(payments);
-        const instructionDineros = payments.map(instruction => Dinero({ amount: instruction.amount, currency: instruction.currency }));
-        return instructionDineros.reduce((acc, next) => {
-            return acc.add(next);
-        }, Dinero({ amount: 0, currency: payments[0].currency })).toFormat('0.00');
-    }
     /**
      * Validates the payment initiation data according to SEPA requirements.
      * @private
@@ -7996,28 +7984,31 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
      */
     serialize() {
         const builder = PaymentInitiation.getBuilder();
-        // Generate multiple PmtInf entries, one per payment instruction group
-        const paymentInfoEntries = this.paymentInstructions.map((group, index) => {
-            const groupSum = this.sumPaymentInstructions(group.payments);
-            const pmtInfId = sanitize(`${this.paymentInformationIdBase}-${index + 1}`, 35);
-            return {
-                PmtInfId: pmtInfId,
-                PmtMtd: 'TRF',
-                NbOfTxs: group.payments.length.toString(),
-                CtrlSum: groupSum,
-                PmtTpInf: {
-                    SvcLvl: { Cd: 'SEPA' },
-                    ...(group.categoryPurpose && {
-                        CtgyPurp: { Cd: group.categoryPurpose }
-                    }),
-                },
-                ReqdExctnDt: this.creationDate.toISOString().split('T')[0],
-                Dbtr: this.party(group.initiatingParty),
-                DbtrAcct: this.account(group.initiatingParty.account),
-                DbtrAgt: this.agent(group.initiatingParty.agent),
-                ChrgBr: 'SLEV',
-                CdtTrfTxInf: group.payments.map(p => this.creditTransfer(p)),
-            };
+        // Generate one PmtInf entry per individual payment
+        const paymentInfoEntries = this.paymentInstructions.flatMap((group, groupIndex) => {
+            return group.payments.map((payment, paymentIndex) => {
+                const dinero = Dinero({ amount: payment.amount, currency: payment.currency });
+                const pmtInfId = sanitize(`${this.paymentInformationIdBase}-${groupIndex + 1}-${paymentIndex + 1}`, 35);
+                const requestedExecutionDate = payment.requestedPaymentExecutionDate || new Date();
+                return {
+                    PmtInfId: pmtInfId,
+                    PmtMtd: 'TRF',
+                    NbOfTxs: '1',
+                    CtrlSum: dinero.toFormat('0.00'),
+                    PmtTpInf: {
+                        SvcLvl: { Cd: 'SEPA' },
+                        ...(group.categoryPurpose && {
+                            CtgyPurp: { Cd: group.categoryPurpose }
+                        }),
+                    },
+                    ReqdExctnDt: requestedExecutionDate.toISOString().split('T')[0],
+                    Dbtr: this.party(group.initiatingParty),
+                    DbtrAcct: this.account(group.initiatingParty.account),
+                    DbtrAgt: this.agent(group.initiatingParty.agent),
+                    ChrgBr: 'SLEV',
+                    CdtTrfTxInf: this.creditTransfer(payment),
+                };
+            });
         });
         const xml = {
             '?xml': {
@@ -8035,13 +8026,15 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
                         CtrlSum: this.formattedPaymentSum,
                         InitgPty: {
                             Nm: this.initiatingParty.name,
-                            Id: {
-                                OrgId: {
-                                    Othr: {
-                                        Id: this.initiatingParty.id,
+                            ...(this.initiatingParty.id && {
+                                Id: {
+                                    OrgId: {
+                                        Othr: {
+                                            Id: this.initiatingParty.id,
+                                        },
                                     },
                                 },
-                            },
+                            }),
                         },
                     },
                     PmtInf: paymentInfoEntries,
@@ -8093,6 +8086,8 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
             };
             // Extract optional category purpose
             const categoryPurpose = pmtInf.PmtTpInf?.CtgyPurp?.Cd;
+            // Extract requested execution date
+            const requestedExecutionDate = pmtInf.ReqdExctnDt ? new Date(pmtInf.ReqdExctnDt) : undefined;
             // Normalize CdtTrfTxInf to array
             const rawInstructions = Array.isArray(pmtInf.CdtTrfTxInf)
                 ? pmtInf.CdtTrfTxInf
@@ -8109,6 +8104,7 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
                     direction: 'credit',
                     amount: amount,
                     currency: currency,
+                    ...(requestedExecutionDate && { requestedPaymentExecutionDate: requestedExecutionDate }),
                     creditor: {
                         name: inst.Cdtr?.Nm,
                         agent: parseAgent(inst.CdtrAgt),

package/dist/index.mjs

@@ -7744,13 +7744,15 @@ class SEPACreditPaymentInitiation extends PaymentInitiation {
                         CtrlSum: this.formattedPaymentSum,
                         InitgPty: {
                             Nm: this.initiatingParty.name,
-                            Id: {
-                                OrgId: {
-                                    Othr: {
-                                        Id: this.initiatingParty.id,
+                            ...(this.initiatingParty.id && {
+                                Id: {
+                                    OrgId: {
+                                        Othr: {
+                                            Id: this.initiatingParty.id,
+                                        },
                                     },
                                 },
-                            },
+                            }),
                         },
                     },
                     PmtInf: {
@@ -7917,20 +7919,6 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
         }
         return Dinero({ amount: totalAmount, currency }).toFormat('0.00');
     }
-    /**
-     * Calculates the sum of payment instructions for a single group.
-     * @private
-     * @param {AtLeastOne<SEPACreditPaymentInstruction>} payments - Array of payment instructions.
-     * @returns {string} The total sum formatted as a string with 2 decimal places.
-     * @throws {Error} If payment instructions have different currencies.
-     */
-    sumPaymentInstructions(payments) {
-        this.validateGroupInstructionsHaveSameCurrency(payments);
-        const instructionDineros = payments.map(instruction => Dinero({ amount: instruction.amount, currency: instruction.currency }));
-        return instructionDineros.reduce((acc, next) => {
-            return acc.add(next);
-        }, Dinero({ amount: 0, currency: payments[0].currency })).toFormat('0.00');
-    }
     /**
      * Validates the payment initiation data according to SEPA requirements.
      * @private
@@ -7994,28 +7982,31 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
      */
     serialize() {
         const builder = PaymentInitiation.getBuilder();
-        // Generate multiple PmtInf entries, one per payment instruction group
-        const paymentInfoEntries = this.paymentInstructions.map((group, index) => {
-            const groupSum = this.sumPaymentInstructions(group.payments);
-            const pmtInfId = sanitize(`${this.paymentInformationIdBase}-${index + 1}`, 35);
-            return {
-                PmtInfId: pmtInfId,
-                PmtMtd: 'TRF',
-                NbOfTxs: group.payments.length.toString(),
-                CtrlSum: groupSum,
-                PmtTpInf: {
-                    SvcLvl: { Cd: 'SEPA' },
-                    ...(group.categoryPurpose && {
-                        CtgyPurp: { Cd: group.categoryPurpose }
-                    }),
-                },
-                ReqdExctnDt: this.creationDate.toISOString().split('T')[0],
-                Dbtr: this.party(group.initiatingParty),
-                DbtrAcct: this.account(group.initiatingParty.account),
-                DbtrAgt: this.agent(group.initiatingParty.agent),
-                ChrgBr: 'SLEV',
-                CdtTrfTxInf: group.payments.map(p => this.creditTransfer(p)),
-            };
+        // Generate one PmtInf entry per individual payment
+        const paymentInfoEntries = this.paymentInstructions.flatMap((group, groupIndex) => {
+            return group.payments.map((payment, paymentIndex) => {
+                const dinero = Dinero({ amount: payment.amount, currency: payment.currency });
+                const pmtInfId = sanitize(`${this.paymentInformationIdBase}-${groupIndex + 1}-${paymentIndex + 1}`, 35);
+                const requestedExecutionDate = payment.requestedPaymentExecutionDate || new Date();
+                return {
+                    PmtInfId: pmtInfId,
+                    PmtMtd: 'TRF',
+                    NbOfTxs: '1',
+                    CtrlSum: dinero.toFormat('0.00'),
+                    PmtTpInf: {
+                        SvcLvl: { Cd: 'SEPA' },
+                        ...(group.categoryPurpose && {
+                            CtgyPurp: { Cd: group.categoryPurpose }
+                        }),
+                    },
+                    ReqdExctnDt: requestedExecutionDate.toISOString().split('T')[0],
+                    Dbtr: this.party(group.initiatingParty),
+                    DbtrAcct: this.account(group.initiatingParty.account),
+                    DbtrAgt: this.agent(group.initiatingParty.agent),
+                    ChrgBr: 'SLEV',
+                    CdtTrfTxInf: this.creditTransfer(payment),
+                };
+            });
         });
         const xml = {
             '?xml': {
@@ -8033,13 +8024,15 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
                         CtrlSum: this.formattedPaymentSum,
                         InitgPty: {
                             Nm: this.initiatingParty.name,
-                            Id: {
-                                OrgId: {
-                                    Othr: {
-                                        Id: this.initiatingParty.id,
+                            ...(this.initiatingParty.id && {
+                                Id: {
+                                    OrgId: {
+                                        Othr: {
+                                            Id: this.initiatingParty.id,
+                                        },
                                     },
                                 },
-                            },
+                            }),
                         },
                     },
                     PmtInf: paymentInfoEntries,
@@ -8091,6 +8084,8 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
             };
             // Extract optional category purpose
             const categoryPurpose = pmtInf.PmtTpInf?.CtgyPurp?.Cd;
+            // Extract requested execution date
+            const requestedExecutionDate = pmtInf.ReqdExctnDt ? new Date(pmtInf.ReqdExctnDt) : undefined;
             // Normalize CdtTrfTxInf to array
             const rawInstructions = Array.isArray(pmtInf.CdtTrfTxInf)
                 ? pmtInf.CdtTrfTxInf
@@ -8107,6 +8102,7 @@ class SEPAMultiCreditPaymentInitiation extends PaymentInitiation {
                     direction: 'credit',
                     amount: amount,
                     currency: currency,
+                    ...(requestedExecutionDate && { requestedPaymentExecutionDate: requestedExecutionDate }),
                     creditor: {
                         name: inst.Cdtr?.Nm,
                         agent: parseAgent(inst.CdtrAgt),

package/dist/src/lib/types.d.ts

@@ -38,6 +38,8 @@ export interface SWIFTCreditPaymentInstruction extends CreditPaymentInstruction
 export interface SEPACreditPaymentInstruction extends CreditPaymentInstruction {
     type?: 'sepa';
     currency: 'EUR';
+    /** Optional requested payment execution date. If not provided, defaults to current date. */
+    requestedPaymentExecutionDate?: Date;
 }
 export interface RTPCreditPaymentInstruction extends CreditPaymentInstruction {
     type?: 'rtp';

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

@@ -84,14 +84,6 @@ export declare class SEPAMultiCreditPaymentInitiation extends PaymentInitiation
      * @returns {string} The total sum formatted as a string with 2 decimal places.
      */
     private sumAllPayments;
-    /**
-     * Calculates the sum of payment instructions for a single group.
-     * @private
-     * @param {AtLeastOne<SEPACreditPaymentInstruction>} payments - Array of payment instructions.
-     * @returns {string} The total sum formatted as a string with 2 decimal places.
-     * @throws {Error} If payment instructions have different currencies.
-     */
-    private sumPaymentInstructions;
     /**
      * Validates the payment initiation data according to SEPA requirements.
      * @private

package/package.json

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