Merge pull request #2952 from CKY-/v5-commafyPadUpdate

feat: add padding to commafy variable
crowbartools · Jan 1, 2025 · f799017 · f799017
2 parents cf1b9d1 + cba4bc2
commit f799017
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/backend/variables/builtin/number/number-commafy.ts b/src/backend/variables/builtin/number/number-commafy.ts
@@ -10,19 +10,32 @@ const model : ReplaceVariable = {
             {
                 usage: "commafy[1000000]",
                 description: `Returns "1,000,000"`
+            },
+            {
+                usage: "commafy[1000000, 2]",
+                description: `Returns "1,000,000.00"`
             }
         ],
         categories: [VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (
         trigger: Trigger,
-        subject: unknown
+        subject: number | string,
+        places: null | number | string
     ) : string => {
         const number = Number(subject);
+        const numPlaces = Number(places);
         if (!Number.isFinite(number)) {
             return "[Error: not a number]";
         }
+
+        if (!Number.isNaN(numPlaces)) {
+            const number = Number(subject).toPrecision(numPlaces);
+            const [integer, fraction] = `${number}.0`.split(/\./g);
+            return `${integer.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}.${fraction}`;
+        }
+
         return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
     }
 };