ng-pli-commons 1.0.124 → 1.0.128

package/fesm2022/ng-pli-commons.mjs

@@ -2521,22 +2521,41 @@ class TokenService {
                 // 	: Array.isArray(objectToken)
                 // 	? JSON.stringify(objectToken)
                 // 	: "'" + objectToken + "'";
-                let value;
-                if (Number(objectToken)) {
-                    value = Number(objectToken);
-                }
-                else if (Array.isArray(objectToken)) {
-                    value = Array.isArray(objectToken);
-                }
-                else if (JSON.stringify(objectToken)) {
-                    value = objectToken.original_name
-                        ? '"' + objectToken.original_name + '"'
-                        : JSON.stringify(objectToken);
+                const tokenLiteral = tokensArray[i].value;
+                const pos = replacedTokens.indexOf(tokenLiteral);
+                //Mantis  11649
+                const quoteCtx = this.getQuoteContext(replacedTokens, pos);
+                const escapeForJs = (s, ctx) => {
+                    let t = String(s ?? '');
+                    t = t.replace(/\\/g, '\\\\'); // backslashes
+                    if (ctx === 'double')
+                        t = t.replace(/"/g, '\\"');
+                    if (ctx === 'single')
+                        t = t.replace(/'/g, "\\'");
+                    return t;
+                };
+                if (quoteCtx) {
+                    const raw = escapeForJs(objectToken, quoteCtx);
+                    replacedTokens = this.replaceToken(replacedTokens, tokenLiteral, raw);
                 }
                 else {
-                    value = '"' + objectToken + '"';
+                    let value;
+                    if (Number(objectToken)) {
+                        value = Number(objectToken);
+                    }
+                    else if (Array.isArray(objectToken)) {
+                        value = Array.isArray(objectToken);
+                    }
+                    else if (JSON.stringify(objectToken)) {
+                        value = objectToken.original_name
+                            ? '"' + objectToken.original_name + '"'
+                            : JSON.stringify(objectToken);
+                    }
+                    else {
+                        value = '"' + objectToken + '"';
+                    }
+                    replacedTokens = this.replaceToken(replacedTokens, tokenLiteral, value);
                 }
-                replacedTokens = this.replaceToken(replacedTokens, tokensArray[i].value, value);
                 // } else {
                 //   console.error(lObjectTokens, tokensArray);
                 //   throw {
@@ -2566,6 +2585,25 @@ class TokenService {
         }
         return replacedTokens;
     }
+    getQuoteContext(src, idx) {
+        let inDouble = false, inSingle = false, esc = false;
+        for (let k = 0; k < idx; k++) {
+            const ch = src[k];
+            if (esc) {
+                esc = false;
+                continue;
+            }
+            if (ch === '\\') {
+                esc = true;
+                continue;
+            }
+            if (ch === '"' && !inSingle)
+                inDouble = !inDouble;
+            else if (ch === "'" && !inDouble)
+                inSingle = !inSingle;
+        }
+        return inDouble ? 'double' : inSingle ? 'single' : null;
+    }
     /**
      * MEtodo que teniendo una expresion de la forma ['tag1', 'tag2']==tag3
      * evalua si tag3 hace parte del array si tiene el operador ==.
@@ -7845,7 +7883,6 @@ class TokenComponent {
         }
         let resumeCategoryYearContent = $('#' + idTotalBudget);
         resumeCategoryYearContent.empty();
-        let seguroDeudoresTotal = 0;
         if (budgetDto && budgetDto.budget && budgetDto.budget.summary) {
             const summary = budgetDto.budget.summary;
             const table = $('<table></table>');
@@ -7907,7 +7944,7 @@ class TokenComponent {
                 tdTotal.css('border', '1px solid black');
                 tdTotal.css('font-weight', 'bold');
                 if (isSeguro) {
-                    seguroDeudoresTotal = category.total;
+                    this.debtorInsurance = category.total;
                 }
             }
             const trFinal = $('<tr>').appendTo(tbody);
@@ -7930,9 +7967,10 @@ class TokenComponent {
                 tdYear.css('background-color', 'grey');
                 budgetTotal += year.total;
             }
+            const tbWithDebtorInsurance = this.debtorInsurance + summary.budgetTotal;
             const totalBaseCurrency = budgetTotal == 0
                 ? '-'
-                : this.currencyPipe.transform(budgetTotal, 'default', '', '1.0-0');
+                : this.currencyPipe.transform(tbWithDebtorInsurance, 'default', '', '1.0-0');
             const totalLabelBaseCurrency = '&nbsp;&nbsp;' + totalBaseCurrency + '&nbsp;&nbsp;';
             const tdFinalTotal = $('<td>', { html: totalLabelBaseCurrency }).appendTo(trFinal);
             tdFinalTotal.css('text-align', 'right');
@@ -16627,9 +16665,9 @@ class CustomValidator {
 /* tslint:disable */
 const VERSION = {
     "dirty": true,
-    "raw": "v0.0.18-2658-gd6f65178-dirty",
-    "hash": "gd6f65178",
-    "distance": 2658,
+    "raw": "v0.0.18-2677-gc97089f5-dirty",
+    "hash": "gc97089f5",
+    "distance": 2677,
     "tag": "v0.0.18",
     "semver": {
         "options": {
@@ -16645,10 +16683,10 @@ const VERSION = {
         "build": [],
         "version": "0.0.18"
     },
-    "suffix": "2658-gd6f65178-dirty",
-    "semverString": "0.0.18+2658.gd6f65178",
-    "version": "1.0.124",
-    "buildTimestamp": "2025-09-26T16:29:59.854Z"
+    "suffix": "2677-gc97089f5-dirty",
+    "semverString": "0.0.18+2677.gc97089f5",
+    "version": "1.0.128",
+    "buildTimestamp": "2025-11-05T14:07:08.659Z"
 };
 /* tslint:enable */