@servicetitan/dte-pdf-editor 1.35.0 → 1.37.0

package/src/utils/formula/format-calculated-result.utils.ts

@@ -1,3 +1,4 @@
+import { DEFAULT_DATE_FORMAT } from '../../constants';
 import { CalculatedFieldFormat } from '../../interface/types';
 
 function roundValue(
@@ -36,9 +37,33 @@ function formatIntegerPart(
     return parts.join(sep);
 }
 
+const DATE_FORMAT_TOKENS: Record<string, (d: Date) => string> = {
+    YYYY: d => String(d.getFullYear()),
+    YY: d => String(d.getFullYear()).slice(-2),
+    MMMM: d => d.toLocaleString('en-US', { month: 'long' }),
+    MMM: d => d.toLocaleString('en-US', { month: 'short' }),
+    MM: d => String(d.getMonth() + 1).padStart(2, '0'),
+    M: d => String(d.getMonth() + 1),
+    DD: d => String(d.getDate()).padStart(2, '0'),
+    D: d => String(d.getDate()),
+};
+
+const DATE_TOKEN_PATTERN = new RegExp(Object.keys(DATE_FORMAT_TOKENS).join('|'), 'g');
+
+function formatDateValue(epochMs: number, dateFormat: string): string {
+    const date = new Date(epochMs);
+    if (isNaN(date.getTime())) {
+        return '';
+    }
+    return dateFormat.replace(DATE_TOKEN_PATTERN, match => {
+        const fn = DATE_FORMAT_TOKENS[match];
+        return fn ? fn(date) : match;
+    });
+}
+
 /**
  * Format a calculated formula result for display using advanced settings.
- * Applies rounding, decimal places, thousands/decimal separators, result type (number/currency/percent), and prefix/postfix.
+ * Applies rounding, decimal places, thousands/decimal separators, result type (number/currency/percent/date), and prefix/postfix.
  */
 export function formatCalculatedResult(
     value: number,
@@ -48,23 +73,21 @@ export function formatCalculatedResult(
         return String(value);
     }
 
+    if (format.resultType === 'date') {
+        return formatDateValue(value, format.dateFormat ?? DEFAULT_DATE_FORMAT);
+    }
+
     const {
         decimalSeparator,
         decimalSeparatorEnabled,
         decimals,
         postfixText,
         prefixText,
-        resultType,
         roundingMode,
         thousandsSeparator,
     } = format;
 
-    let num = value;
-    if (resultType === 'percent') {
-        num = value * 100;
-    }
-
-    const rounded = roundValue(num, decimals, roundingMode);
+    const rounded = roundValue(value, decimals, roundingMode);
     const fixed = rounded.toFixed(decimals);
     const [intPart, decPart] = fixed.split('.');
 
@@ -73,7 +96,6 @@ export function formatCalculatedResult(
     const decSuffix = decimals > 0 ? decimalSep + (decPart ?? '') : '';
 
     const numberStr = intFormatted + decSuffix;
-    const suffix = resultType === 'percent' ? '%' : '';
 
-    return `${prefixText}${numberStr}${suffix}${postfixText}`;
+    return `${prefixText}${numberStr}${postfixText}`;
 }

package/src/utils/formula/validate-formula.utils.ts

@@ -1,3 +1,4 @@
+import { MAX_DATE_CALC_DAYS } from '../../constants';
 import { FormulaToken, StructuredFormula } from '../../interface/types';
 
 export interface FormulaValidationResult {
@@ -20,6 +21,8 @@ function isOperandToken(t: FormulaToken): boolean {
 export function validateFormula(
     formula: StructuredFormula | undefined | null,
     validPaths: Set<string>,
+    knownDateFields?: Set<string>,
+    pathToLabel?: Map<string, string>,
 ): FormulaValidationResult {
     const errors: string[] = [];
 
@@ -61,7 +64,8 @@ export function validateFormula(
             }
         } else if (t.type === 'field') {
             if (!validPaths.has(t.path)) {
-                errors.push(`Unknown field: "${t.label}" (path: ${t.path})`);
+                const label = pathToLabel?.get(t.path) ?? t.path;
+                errors.push(`Unknown field: "${label}" (path: ${t.path})`);
             }
             if (next != null && isOperandToken(next)) {
                 errors.push('Operator required between two fields or values');
@@ -90,6 +94,28 @@ export function validateFormula(
         errors.push('Formula must end with an operand or closing parenthesis');
     }
 
+    if (knownDateFields?.size) {
+        const hasDateField = tokens.some(t => t.type === 'field' && knownDateFields.has(t.path));
+        if (hasDateField) {
+            const hasMultiplyOrDivide = tokens.some(
+                t => t.type === 'operator' && (t.value === '*' || t.value === '/'),
+            );
+            if (hasMultiplyOrDivide) {
+                errors.push(
+                    'Multiply (*) and divide (/) operators cannot be used with date fields. Only +, -, and parentheses are allowed.',
+                );
+            }
+            const hasLargeNumber = tokens.some(
+                t => t.type === 'number' && Math.abs(Number(t.value)) > MAX_DATE_CALC_DAYS,
+            );
+            if (hasLargeNumber) {
+                errors.push(
+                    `Number of days cannot exceed ${MAX_DATE_CALC_DAYS} in date calculations.`,
+                );
+            }
+        }
+    }
+
     return {
         valid: errors.length === 0,
         errors,

package/src/utils/shared/date.utils.ts

@@ -0,0 +1,6 @@
+export const dateToUtcZero = (dateString: string): string => {
+    const [year, month, day] = dateString.split('-').map(Number);
+    const utcDate = new Date(Date.UTC(year, month - 1, day));
+
+    return utcDate.toISOString();
+};

package/src/utils/shared/index.ts

@@ -1 +1,2 @@
+export * from './date.utils';
 export * from './number.utils';