@briza/illogical 2.1.0 → 2.2.1

package/lib/illogical.cjs

@@ -121,6 +121,71 @@ function areAllResults(values) {
 function areAllNumbers(results) {
   return results.every(isNumber);
 }
+function isReference(operand) {
+  return operand.constructor.name === 'Reference';
+}
+function isValue(operand) {
+  return operand.constructor.name === 'Value';
+}
+
+/**
+ * Convert a value to number if possible, otherwise return undefined
+ * @param value value to be converted to number
+ */
+const toNumber = value => {
+  const isValueNumber = isNumber(value);
+  if (isValueNumber) {
+    return value;
+  } else if (isString(value)) {
+    if (value.match(/^\d+\.\d+$/)) {
+      return parseFloat(value);
+    } else if (value.match(/^0$|^[1-9]\d*$/)) {
+      return parseInt(value);
+    }
+  }
+  return undefined;
+};
+
+/**
+ * Convert a value to string if possible, otherwise return undefined
+ * @param value value to be converted to string
+ */
+const toString = value => {
+  if (isNumber(value)) {
+    return `${value}`;
+  } else if (isString(value)) {
+    return value;
+  }
+  return undefined;
+};
+/**
+ * Convert a value to number if it's type is string, otherwise return NaN
+ * @param value value to be converted to number
+ */
+const toDateNumber = value => {
+  if (isString(value)) {
+    return Date.parse(value);
+  }
+  return NaN;
+};
+const formatDateNumber = dateNumber => new Date(dateNumber).toISOString().split('T')[0];
+const toDateDuration = value => {
+  if (!isString(value)) {
+    return;
+  }
+  const isDateDuration = value.match(/^([1-9]\d*)([dmy])$/);
+  if (!isDateDuration) {
+    return;
+  }
+  const unit = isDateDuration[2];
+  if (unit !== 'd' && unit !== 'm' && unit !== 'y') {
+    return;
+  }
+  return {
+    amount: parseInt(isDateDuration[1], 10),
+    unit
+  };
+};
 
 /**
  * Abstract arithmetic expression
@@ -159,6 +224,21 @@ class Arithmetic {
     }
     return presentValues;
   }
+  getDateCalculationResults(results) {
+    const [date, ...durations] = results;
+    const dateNumber = toDateNumber(date);
+    if (isNaN(dateNumber)) {
+      return false;
+    }
+    const parsedDurations = durations.flatMap(d => {
+      const parsedDuration = toDateDuration(d);
+      return parsedDuration ? [parsedDuration] : [];
+    });
+    if (parsedDurations.length !== durations.length) {
+      return false;
+    }
+    return [dateNumber, ...parsedDurations];
+  }
 
   /**
    * Performs the arithmetic operation on the operands evaluated values.
@@ -280,6 +360,63 @@ class Multiply extends Arithmetic {
   }
 }
 
+const dateArithmeticTypeCheck = (...operands) => {
+  const [first, ...rest] = operands;
+  const restAreAllReferences = rest.every(op => isReference(op));
+  const values = rest.filter(op => isValue(op));
+  const valuesAreAllDurations = values.every(op => !!toDateDuration(op.evaluate()));
+  const valuesAreAllNumbers = values.every(op => isNumber(op.evaluate()));
+  if (isReference(first)) {
+    if (!restAreAllReferences && !valuesAreAllDurations && !valuesAreAllNumbers) {
+      throw new Error('sum expression value literals should be all numbers or all date durations');
+    }
+  } else if (isValue(first)) {
+    if (isNumber(first.evaluate())) {
+      if (!restAreAllReferences && !valuesAreAllNumbers) {
+        throw new Error('sum expression value literals should be all numbers');
+      }
+    } else {
+      if (!isNaN(toDateNumber(first.evaluate()))) {
+        if (!restAreAllReferences && !valuesAreAllDurations) {
+          throw new Error('sum expression value literals should be all date durations');
+        }
+      } else {
+        throw new Error(
+        // eslint-disable-next-line max-len
+        'sum expression value literals should be all numbers or starting with an iso date string followed by date durations');
+      }
+    }
+  }
+};
+
+const mutateDateWithDuration = (dateNumber, duration, operator) => {
+  const {
+    amount,
+    unit
+  } = duration;
+  const date = new Date(dateNumber);
+  let targetYear = date.getUTCFullYear();
+  let targetMonthIndex = date.getUTCMonth();
+  const day = date.getUTCDate();
+  let targetDay = day;
+  if (unit === 'd') {
+    const targetDate = new Date(targetYear, targetMonthIndex, targetDay);
+    targetDate.setDate(operator === 'sum' ? targetDate.getDate() + amount : targetDate.getDate() - amount);
+    targetYear = targetDate.getFullYear();
+    targetMonthIndex = targetDate.getMonth();
+    targetDay = targetDate.getDate();
+  } else if (unit === 'm' || unit === 'y') {
+    if (unit === 'm') {
+      targetMonthIndex = operator === 'sum' ? targetMonthIndex + amount : targetMonthIndex - amount;
+    } else if (unit === 'y') {
+      targetYear = operator === 'sum' ? targetYear + amount : targetYear - amount;
+    }
+    const lastDayOfTargetMonth = new Date(targetYear, targetMonthIndex + 1, 0).getDate();
+    targetDay = Math.min(day, lastDayOfTargetMonth);
+  }
+  return new Date(Date.UTC(targetYear, targetMonthIndex, targetDay)).getTime();
+};
+
 // Operator key
 const OPERATOR$j = Symbol('SUBTRACT');
 const subtractWithExpectedDecimals = operateWithExpectedDecimals$1('subtract');
@@ -301,9 +438,15 @@ class Subtract extends Arithmetic {
     if (operands.length < 2) {
       throw new Error('subtract expression requires at least 2 operands');
     }
+    dateArithmeticTypeCheck(...operands);
     super('-', OPERATOR$j, operands);
   }
   operate(results) {
+    const dateCalculationResults = this.getDateCalculationResults(results);
+    if (dateCalculationResults) {
+      const [dateNumber, ...durations] = dateCalculationResults;
+      return formatDateNumber(durations.reduce((mutated, duration) => mutateDateWithDuration(mutated, duration, 'subtract'), dateNumber));
+    }
     const presentResults = this.getResultValues(results);
     if (presentResults === false) {
       return false;
@@ -333,9 +476,15 @@ class Sum extends Arithmetic {
     if (operands.length < 2) {
       throw new Error('sum expression requires at least 2 operands');
     }
+    dateArithmeticTypeCheck(...operands);
     super('+', OPERATOR$i, operands);
   }
   operate(results) {
+    const dateCalculationResults = this.getDateCalculationResults(results);
+    if (dateCalculationResults) {
+      const [dateNumber, ...durations] = dateCalculationResults;
+      return formatDateNumber(durations.reduce((mutated, duration) => mutateDateWithDuration(mutated, duration, 'sum'), dateNumber));
+    }
     const presentResults = this.getResultValues(results);
     if (presentResults === false) {
       return false;
@@ -374,6 +523,17 @@ class Operand {
  * @return {string}
  */
 function printValue(value) {
+  const dateDuration = toDateDuration(value);
+  if (dateDuration) {
+    switch (dateDuration.unit) {
+      case 'd':
+        return `"${dateDuration.amount} ${dateDuration.amount > 1 ? 'days' : 'day'}"`;
+      case 'm':
+        return `"${dateDuration.amount} ${dateDuration.amount > 1 ? 'months' : 'month'}"`;
+      case 'y':
+        return `"${dateDuration.amount} ${dateDuration.amount > 1 ? 'years' : 'year'}"`;
+    }
+  }
   if (isString(value)) {
     return `"${value}"`;
   }
@@ -428,47 +588,6 @@ class Value extends Operand {
   }
 }
 
-/**
- * Convert a value to number if possible, otherwise return undefined
- * @param value value to be converted to number
- */
-const toNumber = value => {
-  const isValueNumber = isNumber(value);
-  if (isValueNumber) {
-    return value;
-  } else if (isString(value)) {
-    if (value.match(/^\d+\.\d+$/)) {
-      return parseFloat(value);
-    } else if (value.match(/^0$|^[1-9]\d*$/)) {
-      return parseInt(value);
-    }
-  }
-  return undefined;
-};
-
-/**
- * Convert a value to string if possible, otherwise return undefined
- * @param value value to be converted to string
- */
-const toString = value => {
-  if (isNumber(value)) {
-    return `${value}`;
-  } else if (isString(value)) {
-    return value;
-  }
-  return undefined;
-};
-/**
- * Convert a value to number if it's type is string, otherwise return NaN
- * @param value value to be converted to number
- */
-const toDateNumber = value => {
-  if (isString(value)) {
-    return Date.parse(value);
-  }
-  return NaN;
-};
-
 const keyWithArrayIndexRegex$1 = /^(?<currentKey>[^[\]]+?)(?<indexes>(?:\[\d+])+)?$/;
 const arrayIndexRegex$1 = /\[(\d+)]/g;
 function parseBacktickWrappedKey$1(key) {
@@ -1955,6 +2074,36 @@ function resolveCompactRef(ref, ctx) {
   }
   return resolveTokens(ref.tokens ?? [], ref.t, ctx);
 }
+function getKeyFromCompactRef(ref) {
+  if (typeof ref === 'string') {
+    return ref;
+  }
+  if (Array.isArray(ref)) {
+    return ref.map(ref => ref.includes('.') ? `\`${ref}\`` : ref).join('.');
+  }
+  let tokens = ref.tokens;
+  if (ref.d) {
+    let current = ref.k;
+    let match = dynamicKeyRegex.exec(current);
+    while (match) {
+      current = current.replace(dynamicKeyRegex, '').replace('[]', '');
+      match = dynamicKeyRegex.exec(current);
+    }
+    tokens = parseStaticKey(current);
+  }
+  let key = '';
+  for (const token of tokens ?? []) {
+    if (isNumber(token.value)) {
+      return key;
+    }
+    if (token.value.includes('.')) {
+      key += `${key ? '.' : ''}\`${token.value}\``;
+    } else {
+      key += `${key ? '.' : ''}${token.value}`;
+    }
+  }
+  return key;
+}
 
 /**
  * Bytecode compiler.
@@ -2722,6 +2871,10 @@ function relationalCompare$1(left, right, op) {
   }
   return false;
 }
+function dateArithmeticReduce$1(values, op) {
+  const [date, ...durations] = values;
+  return formatDateNumber(durations.reduce((mutated, duration) => mutateDateWithDuration(mutated, toDateDuration(duration), op === OP_SUM ? 'sum' : 'subtract'), toDateNumber(date)));
+}
 function arithmeticReduce$1(values, op) {
   if (op === OP_SUM) {
     return values.reduce(addDecimals$1);
@@ -3144,22 +3297,37 @@ function interpret(compiled, ctx) {
               stack$1[++stackTop$1] = false;
               break;
             }
+            const isDateArithmetic = !isNaN(toDateNumber(a));
             if (!isNumber(a) || !isNumber(b)) {
-              throw new Error(`arithmetic operand is not a number: ${!isNumber(a) ? a : b}`);
+              if (op === OP_SUM || op === OP_SUBTRACT) {
+                if (isDateArithmetic) {
+                  const duration = toDateDuration(b);
+                  if (!duration) {
+                    throw new Error(`arithmetic operand is not a date duration: ${b}`);
+                  }
+                } else {
+                  throw new Error(`arithmetic operand is not a number: ${!isNumber(a) ? a : b}`);
+                }
+              } else {
+                throw new Error(`arithmetic operand is not a number: ${!isNumber(a) ? a : b}`);
+              }
             }
             if (op === OP_SUM) {
-              stack$1[++stackTop$1] = addDecimals$1(a, b);
+              stack$1[++stackTop$1] = !isDateArithmetic && isNumber(a) && isNumber(b) ? addDecimals$1(a, b) : formatDateNumber(mutateDateWithDuration(toDateNumber(a), toDateDuration(b), 'sum'));
             } else if (op === OP_SUBTRACT) {
-              stack$1[++stackTop$1] = subtractDecimals$1(a, b);
-            } else if (op === OP_MULTIPLY) {
-              stack$1[++stackTop$1] = multiplyDecimals$1(a, b);
-            } else {
-              stack$1[++stackTop$1] = divideDecimals$1(a, b);
+              stack$1[++stackTop$1] = !isDateArithmetic && isNumber(a) && isNumber(b) ? subtractDecimals$1(a, b) : formatDateNumber(mutateDateWithDuration(toDateNumber(a), toDateDuration(b), 'subtract'));
+            } else if (isNumber(a) && isNumber(b)) {
+              if (op === OP_MULTIPLY) {
+                stack$1[++stackTop$1] = multiplyDecimals$1(a, b);
+              } else {
+                stack$1[++stackTop$1] = divideDecimals$1(a, b);
+              }
             }
             break;
           }
           const values = new Array(n);
           let hasNull = false;
+          const isDateArithmetic = !isNaN(toDateNumber(stack$1[stackTop$1 - n + 1])) && (op === OP_SUM || op === OP_SUBTRACT);
           for (let j = n - 1; j >= 0; j--) {
             const v = stack$1[stackTop$1--];
             if (v === null || v === undefined) {
@@ -3167,11 +3335,20 @@ function interpret(compiled, ctx) {
               break;
             }
             if (!isNumber(v)) {
-              throw new Error(`arithmetic operand is not a number: ${v}`);
+              if (isDateArithmetic) {
+                const duration = toDateDuration(v);
+                if (!duration && j > 0) {
+                  throw new Error(`arithmetic operand is not a date duration: ${v}`);
+                }
+              } else {
+                throw new Error(`arithmetic operand is not a number: ${v}`);
+              }
+            }
+            if (isNumber(v) || isString(v)) {
+              values[j] = v;
             }
-            values[j] = v;
           }
-          stack$1[++stackTop$1] = hasNull ? false : arithmeticReduce$1(values, op);
+          stack$1[++stackTop$1] = hasNull ? false : isDateArithmetic && (op === OP_SUM || op === OP_SUBTRACT) && values.every(v => isString(v)) ? dateArithmeticReduce$1(values, op) : values.every(v => isNumber(v)) ? arithmeticReduce$1(values, op) : false;
           break;
         }
 
@@ -3547,6 +3724,10 @@ function arithmeticReduce(values, op) {
   }
   return values.reduce(divideDecimals);
 }
+function dateArithmeticReduce(values, op) {
+  const [date, ...durations] = values;
+  return formatDateNumber(durations.reduce((mutated, duration) => mutateDateWithDuration(mutated, toDateDuration(duration), op === OP_SUM ? 'sum' : 'subtract'), toDateNumber(date)));
+}
 function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
   const {
     bytecode,
@@ -3606,7 +3787,6 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
       case OP_PUSH_REF_DYNAMIC:
         {
           const idx = numAt(bytecode[i++]);
-          const rawKey = refRawKeys[idx];
           let val;
           if (resolvedRefDirty[idx]) {
             val = resolvedRefCache[idx];
@@ -3625,12 +3805,12 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
           // Ref is absent from context.
           // Check if it should be treated as a concrete undefined (evaluated as undefined)
           // or as a residual expression (preserved for later simplification).
-          if (strictSet?.has(rawKey)) {
+          if (strictSet?.has(getKeyFromCompactRef(refs[idx]))) {
             // strictKeys: force-evaluate as undefined (not a residual)
             stack[++stackTop] = undefined;
             break;
           }
-          if (optionalSet && !optionalSet.has(rawKey)) {
+          if (optionalSet && !optionalSet.has(getKeyFromCompactRef(refs[idx]))) {
             // Key not in optionalKeys: treat as definitely-present but absent → undefined
             stack[++stackTop] = undefined;
             break;
@@ -4197,31 +4377,45 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
               stack[++stackTop] = false;
               break;
             }
+            const isDateArithmetic = !isNaN(toDateNumber(aVal));
             if (!isNumber(aVal) || !isNumber(bVal)) {
-              throw new Error(`arithmetic operand is not a number: ${!isNumber(aVal) ? aVal : bVal}`);
+              if (op === OP_SUM || op === OP_SUBTRACT) {
+                if (isDateArithmetic) {
+                  const duration = toDateDuration(bVal);
+                  if (!duration) {
+                    throw new Error(`arithmetic operand is not a date duration: ${bVal}`);
+                  }
+                } else {
+                  throw new Error(`arithmetic operand is not a number: ${!isNumber(aVal) ? aVal : bVal}`);
+                }
+              } else {
+                throw new Error(`arithmetic operand is not a number: ${!isNumber(aVal) ? aVal : bVal}`);
+              }
             }
             // After the throw above, aVal and bVal are narrowed to number
             if (op === OP_SUM) {
-              stack[++stackTop] = addDecimals(aVal, bVal);
+              stack[++stackTop] = !isDateArithmetic && isNumber(aVal) && isNumber(bVal) ? addDecimals(aVal, bVal) : formatDateNumber(mutateDateWithDuration(toDateNumber(aVal), toDateDuration(bVal), 'sum'));
             } else if (op === OP_SUBTRACT) {
-              stack[++stackTop] = subtractDecimals(aVal, bVal);
-            } else if (op === OP_MULTIPLY) {
-              stack[++stackTop] = multiplyDecimals(aVal, bVal);
-            } else {
-              // Division — match OOP isInfinite guard: use a marker so
-              // comparisons can decide whether to preserve the expression.
-              const result = divideDecimals(aVal, bVal);
-              if (isUnusableResult(result)) {
-                // Push marker with original operands for reconstruction
-                const marker = {
-                  _r: 4,
-                  _val: result,
-                  left: aVal,
-                  right: bVal
-                };
-                stack[++stackTop] = marker;
+              stack[++stackTop] = !isDateArithmetic && isNumber(aVal) && isNumber(bVal) ? subtractDecimals(aVal, bVal) : formatDateNumber(mutateDateWithDuration(toDateNumber(aVal), toDateDuration(bVal), 'subtract'));
+            } else if (isNumber(aVal) && isNumber(bVal)) {
+              if (op === OP_MULTIPLY) {
+                stack[++stackTop] = multiplyDecimals(aVal, bVal);
               } else {
-                stack[++stackTop] = result;
+                // Division — match OOP isInfinite guard: use a marker so
+                // comparisons can decide whether to preserve the expression.
+                const result = divideDecimals(aVal, bVal);
+                if (isUnusableResult(result)) {
+                  // Push marker with original operands for reconstruction
+                  const marker = {
+                    _r: 4,
+                    _val: result,
+                    left: aVal,
+                    right: bVal
+                  };
+                  stack[++stackTop] = marker;
+                } else {
+                  stack[++stackTop] = result;
+                }
               }
             }
             break;
@@ -4229,6 +4423,8 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
           // N-operand path
           const values = new Array(n);
           let hasNull = false;
+          const firstOperand = slotVal(stack[stackTop - n + 1]);
+          const isDateArithmetic = typeof firstOperand !== 'object' && !isNaN(toDateNumber(firstOperand)) && (op === OP_SUM || op === OP_SUBTRACT);
           for (let j = n - 1; j >= 0; j--) {
             const v = slotVal(stack[stackTop--]);
             if (v === null || v === undefined) {
@@ -4236,15 +4432,24 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
               break;
             }
             if (!isNumber(v)) {
-              throw new Error(`arithmetic operand is not a number: ${v}`);
+              if (isDateArithmetic) {
+                const duration = toDateDuration(v);
+                if (!duration && j > 0) {
+                  throw new Error(`arithmetic operand is not a date duration: ${v}`);
+                }
+              } else {
+                throw new Error(`arithmetic operand is not a number: ${v}`);
+              }
             }
             // After the throw above, v is narrowed to number
-            values[j] = v;
+            if (isNumber(v) || isString(v)) {
+              values[j] = v;
+            }
           }
-          const reduced = hasNull ? false : arithmeticReduce(values, op);
+          const reduced = hasNull ? false : isDateArithmetic && (op === OP_SUM || op === OP_SUBTRACT) && values.every(v => isString(v)) ? dateArithmeticReduce(values, op) : values.every(v => isNumber(v)) ? arithmeticReduce(values, op) : false;
           if (hasNull) {
             stack[++stackTop] = false;
-          } else if (op === OP_DIVIDE && reduced !== false && isUnusableResult(reduced)) {
+          } else if (op === OP_DIVIDE && reduced !== false && isNumber(reduced) && isUnusableResult(reduced)) {
             // N-operand division producing Infinity/NaN — create marker
             const result = reduced;
             const marker = {
@@ -4254,7 +4459,7 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
               right: values[1]
             };
             stack[++stackTop] = marker;
-          } else if (reduced !== false && isUnusableResult(reduced)) {
+          } else if (reduced !== false && isNumber(reduced) && isUnusableResult(reduced)) {
             // Other arithmetic producing Infinity/NaN — preserve expression
             stack[++stackTop] = makeResidual([opNames[op], ...values]);
           } else {

package/lib/illogical.esm.js

@@ -117,6 +117,71 @@ function areAllResults(values) {
 function areAllNumbers(results) {
   return results.every(isNumber);
 }
+function isReference(operand) {
+  return operand.constructor.name === 'Reference';
+}
+function isValue(operand) {
+  return operand.constructor.name === 'Value';
+}
+
+/**
+ * Convert a value to number if possible, otherwise return undefined
+ * @param value value to be converted to number
+ */
+const toNumber = value => {
+  const isValueNumber = isNumber(value);
+  if (isValueNumber) {
+    return value;
+  } else if (isString(value)) {
+    if (value.match(/^\d+\.\d+$/)) {
+      return parseFloat(value);
+    } else if (value.match(/^0$|^[1-9]\d*$/)) {
+      return parseInt(value);
+    }
+  }
+  return undefined;
+};
+
+/**
+ * Convert a value to string if possible, otherwise return undefined
+ * @param value value to be converted to string
+ */
+const toString = value => {
+  if (isNumber(value)) {
+    return `${value}`;
+  } else if (isString(value)) {
+    return value;
+  }
+  return undefined;
+};
+/**
+ * Convert a value to number if it's type is string, otherwise return NaN
+ * @param value value to be converted to number
+ */
+const toDateNumber = value => {
+  if (isString(value)) {
+    return Date.parse(value);
+  }
+  return NaN;
+};
+const formatDateNumber = dateNumber => new Date(dateNumber).toISOString().split('T')[0];
+const toDateDuration = value => {
+  if (!isString(value)) {
+    return;
+  }
+  const isDateDuration = value.match(/^([1-9]\d*)([dmy])$/);
+  if (!isDateDuration) {
+    return;
+  }
+  const unit = isDateDuration[2];
+  if (unit !== 'd' && unit !== 'm' && unit !== 'y') {
+    return;
+  }
+  return {
+    amount: parseInt(isDateDuration[1], 10),
+    unit
+  };
+};
 
 /**
  * Abstract arithmetic expression
@@ -155,6 +220,21 @@ class Arithmetic {
     }
     return presentValues;
   }
+  getDateCalculationResults(results) {
+    const [date, ...durations] = results;
+    const dateNumber = toDateNumber(date);
+    if (isNaN(dateNumber)) {
+      return false;
+    }
+    const parsedDurations = durations.flatMap(d => {
+      const parsedDuration = toDateDuration(d);
+      return parsedDuration ? [parsedDuration] : [];
+    });
+    if (parsedDurations.length !== durations.length) {
+      return false;
+    }
+    return [dateNumber, ...parsedDurations];
+  }
 
   /**
    * Performs the arithmetic operation on the operands evaluated values.
@@ -276,6 +356,63 @@ class Multiply extends Arithmetic {
   }
 }
 
+const dateArithmeticTypeCheck = (...operands) => {
+  const [first, ...rest] = operands;
+  const restAreAllReferences = rest.every(op => isReference(op));
+  const values = rest.filter(op => isValue(op));
+  const valuesAreAllDurations = values.every(op => !!toDateDuration(op.evaluate()));
+  const valuesAreAllNumbers = values.every(op => isNumber(op.evaluate()));
+  if (isReference(first)) {
+    if (!restAreAllReferences && !valuesAreAllDurations && !valuesAreAllNumbers) {
+      throw new Error('sum expression value literals should be all numbers or all date durations');
+    }
+  } else if (isValue(first)) {
+    if (isNumber(first.evaluate())) {
+      if (!restAreAllReferences && !valuesAreAllNumbers) {
+        throw new Error('sum expression value literals should be all numbers');
+      }
+    } else {
+      if (!isNaN(toDateNumber(first.evaluate()))) {
+        if (!restAreAllReferences && !valuesAreAllDurations) {
+          throw new Error('sum expression value literals should be all date durations');
+        }
+      } else {
+        throw new Error(
+        // eslint-disable-next-line max-len
+        'sum expression value literals should be all numbers or starting with an iso date string followed by date durations');
+      }
+    }
+  }
+};
+
+const mutateDateWithDuration = (dateNumber, duration, operator) => {
+  const {
+    amount,
+    unit
+  } = duration;
+  const date = new Date(dateNumber);
+  let targetYear = date.getUTCFullYear();
+  let targetMonthIndex = date.getUTCMonth();
+  const day = date.getUTCDate();
+  let targetDay = day;
+  if (unit === 'd') {
+    const targetDate = new Date(targetYear, targetMonthIndex, targetDay);
+    targetDate.setDate(operator === 'sum' ? targetDate.getDate() + amount : targetDate.getDate() - amount);
+    targetYear = targetDate.getFullYear();
+    targetMonthIndex = targetDate.getMonth();
+    targetDay = targetDate.getDate();
+  } else if (unit === 'm' || unit === 'y') {
+    if (unit === 'm') {
+      targetMonthIndex = operator === 'sum' ? targetMonthIndex + amount : targetMonthIndex - amount;
+    } else if (unit === 'y') {
+      targetYear = operator === 'sum' ? targetYear + amount : targetYear - amount;
+    }
+    const lastDayOfTargetMonth = new Date(targetYear, targetMonthIndex + 1, 0).getDate();
+    targetDay = Math.min(day, lastDayOfTargetMonth);
+  }
+  return new Date(Date.UTC(targetYear, targetMonthIndex, targetDay)).getTime();
+};
+
 // Operator key
 const OPERATOR$j = Symbol('SUBTRACT');
 const subtractWithExpectedDecimals = operateWithExpectedDecimals$1('subtract');
@@ -297,9 +434,15 @@ class Subtract extends Arithmetic {
     if (operands.length < 2) {
       throw new Error('subtract expression requires at least 2 operands');
     }
+    dateArithmeticTypeCheck(...operands);
     super('-', OPERATOR$j, operands);
   }
   operate(results) {
+    const dateCalculationResults = this.getDateCalculationResults(results);
+    if (dateCalculationResults) {
+      const [dateNumber, ...durations] = dateCalculationResults;
+      return formatDateNumber(durations.reduce((mutated, duration) => mutateDateWithDuration(mutated, duration, 'subtract'), dateNumber));
+    }
     const presentResults = this.getResultValues(results);
     if (presentResults === false) {
       return false;
@@ -329,9 +472,15 @@ class Sum extends Arithmetic {
     if (operands.length < 2) {
       throw new Error('sum expression requires at least 2 operands');
     }
+    dateArithmeticTypeCheck(...operands);
     super('+', OPERATOR$i, operands);
   }
   operate(results) {
+    const dateCalculationResults = this.getDateCalculationResults(results);
+    if (dateCalculationResults) {
+      const [dateNumber, ...durations] = dateCalculationResults;
+      return formatDateNumber(durations.reduce((mutated, duration) => mutateDateWithDuration(mutated, duration, 'sum'), dateNumber));
+    }
     const presentResults = this.getResultValues(results);
     if (presentResults === false) {
       return false;
@@ -370,6 +519,17 @@ class Operand {
  * @return {string}
  */
 function printValue(value) {
+  const dateDuration = toDateDuration(value);
+  if (dateDuration) {
+    switch (dateDuration.unit) {
+      case 'd':
+        return `"${dateDuration.amount} ${dateDuration.amount > 1 ? 'days' : 'day'}"`;
+      case 'm':
+        return `"${dateDuration.amount} ${dateDuration.amount > 1 ? 'months' : 'month'}"`;
+      case 'y':
+        return `"${dateDuration.amount} ${dateDuration.amount > 1 ? 'years' : 'year'}"`;
+    }
+  }
   if (isString(value)) {
     return `"${value}"`;
   }
@@ -424,47 +584,6 @@ class Value extends Operand {
   }
 }
 
-/**
- * Convert a value to number if possible, otherwise return undefined
- * @param value value to be converted to number
- */
-const toNumber = value => {
-  const isValueNumber = isNumber(value);
-  if (isValueNumber) {
-    return value;
-  } else if (isString(value)) {
-    if (value.match(/^\d+\.\d+$/)) {
-      return parseFloat(value);
-    } else if (value.match(/^0$|^[1-9]\d*$/)) {
-      return parseInt(value);
-    }
-  }
-  return undefined;
-};
-
-/**
- * Convert a value to string if possible, otherwise return undefined
- * @param value value to be converted to string
- */
-const toString = value => {
-  if (isNumber(value)) {
-    return `${value}`;
-  } else if (isString(value)) {
-    return value;
-  }
-  return undefined;
-};
-/**
- * Convert a value to number if it's type is string, otherwise return NaN
- * @param value value to be converted to number
- */
-const toDateNumber = value => {
-  if (isString(value)) {
-    return Date.parse(value);
-  }
-  return NaN;
-};
-
 const keyWithArrayIndexRegex$1 = /^(?<currentKey>[^[\]]+?)(?<indexes>(?:\[\d+])+)?$/;
 const arrayIndexRegex$1 = /\[(\d+)]/g;
 function parseBacktickWrappedKey$1(key) {
@@ -1951,6 +2070,36 @@ function resolveCompactRef(ref, ctx) {
   }
   return resolveTokens(ref.tokens ?? [], ref.t, ctx);
 }
+function getKeyFromCompactRef(ref) {
+  if (typeof ref === 'string') {
+    return ref;
+  }
+  if (Array.isArray(ref)) {
+    return ref.map(ref => ref.includes('.') ? `\`${ref}\`` : ref).join('.');
+  }
+  let tokens = ref.tokens;
+  if (ref.d) {
+    let current = ref.k;
+    let match = dynamicKeyRegex.exec(current);
+    while (match) {
+      current = current.replace(dynamicKeyRegex, '').replace('[]', '');
+      match = dynamicKeyRegex.exec(current);
+    }
+    tokens = parseStaticKey(current);
+  }
+  let key = '';
+  for (const token of tokens ?? []) {
+    if (isNumber(token.value)) {
+      return key;
+    }
+    if (token.value.includes('.')) {
+      key += `${key ? '.' : ''}\`${token.value}\``;
+    } else {
+      key += `${key ? '.' : ''}${token.value}`;
+    }
+  }
+  return key;
+}
 
 /**
  * Bytecode compiler.
@@ -2718,6 +2867,10 @@ function relationalCompare$1(left, right, op) {
   }
   return false;
 }
+function dateArithmeticReduce$1(values, op) {
+  const [date, ...durations] = values;
+  return formatDateNumber(durations.reduce((mutated, duration) => mutateDateWithDuration(mutated, toDateDuration(duration), op === OP_SUM ? 'sum' : 'subtract'), toDateNumber(date)));
+}
 function arithmeticReduce$1(values, op) {
   if (op === OP_SUM) {
     return values.reduce(addDecimals$1);
@@ -3140,22 +3293,37 @@ function interpret(compiled, ctx) {
               stack$1[++stackTop$1] = false;
               break;
             }
+            const isDateArithmetic = !isNaN(toDateNumber(a));
             if (!isNumber(a) || !isNumber(b)) {
-              throw new Error(`arithmetic operand is not a number: ${!isNumber(a) ? a : b}`);
+              if (op === OP_SUM || op === OP_SUBTRACT) {
+                if (isDateArithmetic) {
+                  const duration = toDateDuration(b);
+                  if (!duration) {
+                    throw new Error(`arithmetic operand is not a date duration: ${b}`);
+                  }
+                } else {
+                  throw new Error(`arithmetic operand is not a number: ${!isNumber(a) ? a : b}`);
+                }
+              } else {
+                throw new Error(`arithmetic operand is not a number: ${!isNumber(a) ? a : b}`);
+              }
             }
             if (op === OP_SUM) {
-              stack$1[++stackTop$1] = addDecimals$1(a, b);
+              stack$1[++stackTop$1] = !isDateArithmetic && isNumber(a) && isNumber(b) ? addDecimals$1(a, b) : formatDateNumber(mutateDateWithDuration(toDateNumber(a), toDateDuration(b), 'sum'));
             } else if (op === OP_SUBTRACT) {
-              stack$1[++stackTop$1] = subtractDecimals$1(a, b);
-            } else if (op === OP_MULTIPLY) {
-              stack$1[++stackTop$1] = multiplyDecimals$1(a, b);
-            } else {
-              stack$1[++stackTop$1] = divideDecimals$1(a, b);
+              stack$1[++stackTop$1] = !isDateArithmetic && isNumber(a) && isNumber(b) ? subtractDecimals$1(a, b) : formatDateNumber(mutateDateWithDuration(toDateNumber(a), toDateDuration(b), 'subtract'));
+            } else if (isNumber(a) && isNumber(b)) {
+              if (op === OP_MULTIPLY) {
+                stack$1[++stackTop$1] = multiplyDecimals$1(a, b);
+              } else {
+                stack$1[++stackTop$1] = divideDecimals$1(a, b);
+              }
             }
             break;
           }
           const values = new Array(n);
           let hasNull = false;
+          const isDateArithmetic = !isNaN(toDateNumber(stack$1[stackTop$1 - n + 1])) && (op === OP_SUM || op === OP_SUBTRACT);
           for (let j = n - 1; j >= 0; j--) {
             const v = stack$1[stackTop$1--];
             if (v === null || v === undefined) {
@@ -3163,11 +3331,20 @@ function interpret(compiled, ctx) {
               break;
             }
             if (!isNumber(v)) {
-              throw new Error(`arithmetic operand is not a number: ${v}`);
+              if (isDateArithmetic) {
+                const duration = toDateDuration(v);
+                if (!duration && j > 0) {
+                  throw new Error(`arithmetic operand is not a date duration: ${v}`);
+                }
+              } else {
+                throw new Error(`arithmetic operand is not a number: ${v}`);
+              }
+            }
+            if (isNumber(v) || isString(v)) {
+              values[j] = v;
             }
-            values[j] = v;
           }
-          stack$1[++stackTop$1] = hasNull ? false : arithmeticReduce$1(values, op);
+          stack$1[++stackTop$1] = hasNull ? false : isDateArithmetic && (op === OP_SUM || op === OP_SUBTRACT) && values.every(v => isString(v)) ? dateArithmeticReduce$1(values, op) : values.every(v => isNumber(v)) ? arithmeticReduce$1(values, op) : false;
           break;
         }
 
@@ -3543,6 +3720,10 @@ function arithmeticReduce(values, op) {
   }
   return values.reduce(divideDecimals);
 }
+function dateArithmeticReduce(values, op) {
+  const [date, ...durations] = values;
+  return formatDateNumber(durations.reduce((mutated, duration) => mutateDateWithDuration(mutated, toDateDuration(duration), op === OP_SUM ? 'sum' : 'subtract'), toDateNumber(date)));
+}
 function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
   const {
     bytecode,
@@ -3602,7 +3783,6 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
       case OP_PUSH_REF_DYNAMIC:
         {
           const idx = numAt(bytecode[i++]);
-          const rawKey = refRawKeys[idx];
           let val;
           if (resolvedRefDirty[idx]) {
             val = resolvedRefCache[idx];
@@ -3621,12 +3801,12 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
           // Ref is absent from context.
           // Check if it should be treated as a concrete undefined (evaluated as undefined)
           // or as a residual expression (preserved for later simplification).
-          if (strictSet?.has(rawKey)) {
+          if (strictSet?.has(getKeyFromCompactRef(refs[idx]))) {
             // strictKeys: force-evaluate as undefined (not a residual)
             stack[++stackTop] = undefined;
             break;
           }
-          if (optionalSet && !optionalSet.has(rawKey)) {
+          if (optionalSet && !optionalSet.has(getKeyFromCompactRef(refs[idx]))) {
             // Key not in optionalKeys: treat as definitely-present but absent → undefined
             stack[++stackTop] = undefined;
             break;
@@ -4193,31 +4373,45 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
               stack[++stackTop] = false;
               break;
             }
+            const isDateArithmetic = !isNaN(toDateNumber(aVal));
             if (!isNumber(aVal) || !isNumber(bVal)) {
-              throw new Error(`arithmetic operand is not a number: ${!isNumber(aVal) ? aVal : bVal}`);
+              if (op === OP_SUM || op === OP_SUBTRACT) {
+                if (isDateArithmetic) {
+                  const duration = toDateDuration(bVal);
+                  if (!duration) {
+                    throw new Error(`arithmetic operand is not a date duration: ${bVal}`);
+                  }
+                } else {
+                  throw new Error(`arithmetic operand is not a number: ${!isNumber(aVal) ? aVal : bVal}`);
+                }
+              } else {
+                throw new Error(`arithmetic operand is not a number: ${!isNumber(aVal) ? aVal : bVal}`);
+              }
             }
             // After the throw above, aVal and bVal are narrowed to number
             if (op === OP_SUM) {
-              stack[++stackTop] = addDecimals(aVal, bVal);
+              stack[++stackTop] = !isDateArithmetic && isNumber(aVal) && isNumber(bVal) ? addDecimals(aVal, bVal) : formatDateNumber(mutateDateWithDuration(toDateNumber(aVal), toDateDuration(bVal), 'sum'));
             } else if (op === OP_SUBTRACT) {
-              stack[++stackTop] = subtractDecimals(aVal, bVal);
-            } else if (op === OP_MULTIPLY) {
-              stack[++stackTop] = multiplyDecimals(aVal, bVal);
-            } else {
-              // Division — match OOP isInfinite guard: use a marker so
-              // comparisons can decide whether to preserve the expression.
-              const result = divideDecimals(aVal, bVal);
-              if (isUnusableResult(result)) {
-                // Push marker with original operands for reconstruction
-                const marker = {
-                  _r: 4,
-                  _val: result,
-                  left: aVal,
-                  right: bVal
-                };
-                stack[++stackTop] = marker;
+              stack[++stackTop] = !isDateArithmetic && isNumber(aVal) && isNumber(bVal) ? subtractDecimals(aVal, bVal) : formatDateNumber(mutateDateWithDuration(toDateNumber(aVal), toDateDuration(bVal), 'subtract'));
+            } else if (isNumber(aVal) && isNumber(bVal)) {
+              if (op === OP_MULTIPLY) {
+                stack[++stackTop] = multiplyDecimals(aVal, bVal);
               } else {
-                stack[++stackTop] = result;
+                // Division — match OOP isInfinite guard: use a marker so
+                // comparisons can decide whether to preserve the expression.
+                const result = divideDecimals(aVal, bVal);
+                if (isUnusableResult(result)) {
+                  // Push marker with original operands for reconstruction
+                  const marker = {
+                    _r: 4,
+                    _val: result,
+                    left: aVal,
+                    right: bVal
+                  };
+                  stack[++stackTop] = marker;
+                } else {
+                  stack[++stackTop] = result;
+                }
               }
             }
             break;
@@ -4225,6 +4419,8 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
           // N-operand path
           const values = new Array(n);
           let hasNull = false;
+          const firstOperand = slotVal(stack[stackTop - n + 1]);
+          const isDateArithmetic = typeof firstOperand !== 'object' && !isNaN(toDateNumber(firstOperand)) && (op === OP_SUM || op === OP_SUBTRACT);
           for (let j = n - 1; j >= 0; j--) {
             const v = slotVal(stack[stackTop--]);
             if (v === null || v === undefined) {
@@ -4232,15 +4428,24 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
               break;
             }
             if (!isNumber(v)) {
-              throw new Error(`arithmetic operand is not a number: ${v}`);
+              if (isDateArithmetic) {
+                const duration = toDateDuration(v);
+                if (!duration && j > 0) {
+                  throw new Error(`arithmetic operand is not a date duration: ${v}`);
+                }
+              } else {
+                throw new Error(`arithmetic operand is not a number: ${v}`);
+              }
             }
             // After the throw above, v is narrowed to number
-            values[j] = v;
+            if (isNumber(v) || isString(v)) {
+              values[j] = v;
+            }
           }
-          const reduced = hasNull ? false : arithmeticReduce(values, op);
+          const reduced = hasNull ? false : isDateArithmetic && (op === OP_SUM || op === OP_SUBTRACT) && values.every(v => isString(v)) ? dateArithmeticReduce(values, op) : values.every(v => isNumber(v)) ? arithmeticReduce(values, op) : false;
           if (hasNull) {
             stack[++stackTop] = false;
-          } else if (op === OP_DIVIDE && reduced !== false && isUnusableResult(reduced)) {
+          } else if (op === OP_DIVIDE && reduced !== false && isNumber(reduced) && isUnusableResult(reduced)) {
             // N-operand division producing Infinity/NaN — create marker
             const result = reduced;
             const marker = {
@@ -4250,7 +4455,7 @@ function interpretSimplify(compiled, ctx, strictKeys, optionalKeys) {
               right: values[1]
             };
             stack[++stackTop] = marker;
-          } else if (reduced !== false && isUnusableResult(reduced)) {
+          } else if (reduced !== false && isNumber(reduced) && isUnusableResult(reduced)) {
             // Other arithmetic producing Infinity/NaN — preserve expression
             stack[++stackTop] = makeResidual([opNames[op], ...values]);
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@briza/illogical",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "A micro conditional javascript engine used to parse the raw logical and comparison expressions, evaluate the expression in the given data context, and provide access to a text form of the given expressions.",
   "type": "module",
   "main": "./lib/illogical.cjs",
@@ -33,26 +33,26 @@
     "prepublishOnly": "npm run test && npm run build",
     "check-licenses": "license-checker --summary --excludePrivatePackages --onlyAllow \"MIT;MIT OR X11;Apache-2.0;ISC;BSD-3-Clause;BSD-2-Clause;CC-BY-4.0;Public Domain;BSD;CC-BY-3.0;CC0-1.0;Python-2.0;BlueOak-1.0.0;Unlicense\"",
     "bench": "npm run build && node --import tsx src/benchmark/evaluate.ts --cases conditions/sample-conditions    --out benchmark/results-sample-evaluate-oop.json && node --import tsx src/benchmark/evaluate.ts --cases conditions/sample-conditions    --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-sample-evaluate-bytecode.json && node --import tsx src/benchmark/evaluate.ts --cases conditions/synthetic-conditions --out benchmark/results-synthetic-evaluate-oop.json && node --import tsx src/benchmark/evaluate.ts --cases conditions/synthetic-conditions --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-synthetic-evaluate-bytecode.json && node --import tsx src/benchmark/simplify.ts --cases conditions/sample-conditions    --out benchmark/results-sample-simplify-oop.json && node --import tsx src/benchmark/simplify.ts --cases conditions/sample-conditions    --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-sample-simplify-bytecode.json && node --import tsx src/benchmark/simplify.ts --cases conditions/synthetic-conditions --out benchmark/results-synthetic-simplify-oop.json && node --import tsx src/benchmark/simplify.ts --cases conditions/synthetic-conditions --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-synthetic-simplify-bytecode.json && node --import tsx src/benchmark/report.ts benchmark/results-sample-evaluate-oop.json    benchmark/results-sample-evaluate-bytecode.json    --op evaluate --out benchmark/report-sample-evaluate.md && node --import tsx src/benchmark/report.ts benchmark/results-synthetic-evaluate-oop.json benchmark/results-synthetic-evaluate-bytecode.json --op evaluate --out benchmark/report-synthetic-evaluate.md && node --import tsx src/benchmark/report.ts benchmark/results-sample-simplify-oop.json    benchmark/results-sample-simplify-bytecode.json    --op simplify --out benchmark/report-sample-simplify.md && node --import tsx src/benchmark/report.ts benchmark/results-synthetic-simplify-oop.json benchmark/results-synthetic-simplify-bytecode.json --op simplify --out benchmark/report-synthetic-simplify.md",
-    "bench:sample:oop:evaluate":              "npm run build && node --import tsx src/benchmark/evaluate.ts --cases conditions/sample-conditions    --out benchmark/results-sample-evaluate-oop.json",
-    "bench:sample:oop:simplify":              "npm run build && node --import tsx src/benchmark/simplify.ts --cases conditions/sample-conditions    --out benchmark/results-sample-simplify-oop.json",
-    "bench:synthetic:oop:evaluate":           "npm run build && node --import tsx src/benchmark/evaluate.ts --cases conditions/synthetic-conditions --out benchmark/results-synthetic-evaluate-oop.json",
-    "bench:synthetic:oop:simplify":           "npm run build && node --import tsx src/benchmark/simplify.ts --cases conditions/synthetic-conditions --out benchmark/results-synthetic-simplify-oop.json",
-    "bench:sample:bytecode:evaluate":         "npm run build && node --import tsx src/benchmark/evaluate.ts --cases conditions/sample-conditions    --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-sample-evaluate-bytecode.json",
-    "bench:synthetic:bytecode:evaluate":      "npm run build && node --import tsx src/benchmark/evaluate.ts --cases conditions/synthetic-conditions --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-synthetic-evaluate-bytecode.json",
-    "bench:sample:bytecode:simplify":         "npm run build && node --import tsx src/benchmark/simplify.ts --cases conditions/sample-conditions    --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-sample-simplify-bytecode.json",
-    "bench:synthetic:bytecode:simplify":      "npm run build && node --import tsx src/benchmark/simplify.ts --cases conditions/synthetic-conditions --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-synthetic-simplify-bytecode.json",
-    "bench:sample:compare:evaluate":          "node --import tsx src/benchmark/compare.ts benchmark/results-sample-evaluate-oop.json    benchmark/results-sample-evaluate-bytecode.json",
-    "bench:synthetic:compare:evaluate":       "node --import tsx src/benchmark/compare.ts benchmark/results-synthetic-evaluate-oop.json benchmark/results-synthetic-evaluate-bytecode.json",
-    "bench:sample:compare:simplify":          "node --import tsx src/benchmark/compare.ts benchmark/results-sample-simplify-oop.json    benchmark/results-sample-simplify-bytecode.json",
-    "bench:synthetic:compare:simplify":       "node --import tsx src/benchmark/compare.ts benchmark/results-synthetic-simplify-oop.json benchmark/results-synthetic-simplify-bytecode.json",
-    "bench:sample:report:evaluate":           "node --import tsx src/benchmark/report.ts benchmark/results-sample-evaluate-oop.json    benchmark/results-sample-evaluate-bytecode.json    --op evaluate --out benchmark/report-sample-evaluate.md",
-    "bench:synthetic:report:evaluate":        "node --import tsx src/benchmark/report.ts benchmark/results-synthetic-evaluate-oop.json benchmark/results-synthetic-evaluate-bytecode.json --op evaluate --out benchmark/report-synthetic-evaluate.md",
-    "bench:sample:report:full:evaluate":      "node --import tsx src/benchmark/report.ts benchmark/results-sample-evaluate-oop.json    benchmark/results-sample-evaluate-bytecode.json    --op evaluate --full --out benchmark/report-sample-evaluate-full.md",
-    "bench:synthetic:report:full:evaluate":   "node --import tsx src/benchmark/report.ts benchmark/results-synthetic-evaluate-oop.json benchmark/results-synthetic-evaluate-bytecode.json --op evaluate --full --out benchmark/report-synthetic-evaluate-full.md",
-    "bench:sample:report:simplify":           "node --import tsx src/benchmark/report.ts benchmark/results-sample-simplify-oop.json    benchmark/results-sample-simplify-bytecode.json    --op simplify --out benchmark/report-sample-simplify.md",
-    "bench:synthetic:report:simplify":        "node --import tsx src/benchmark/report.ts benchmark/results-synthetic-simplify-oop.json benchmark/results-synthetic-simplify-bytecode.json --op simplify --out benchmark/report-synthetic-simplify.md",
-    "bench:sample:report:full:simplify":      "node --import tsx src/benchmark/report.ts benchmark/results-sample-simplify-oop.json    benchmark/results-sample-simplify-bytecode.json    --op simplify --full --out benchmark/report-sample-simplify-full.md",
-    "bench:synthetic:report:full:simplify":   "node --import tsx src/benchmark/report.ts benchmark/results-synthetic-simplify-oop.json benchmark/results-synthetic-simplify-bytecode.json --op simplify --full --out benchmark/report-synthetic-simplify-full.md",
+    "bench:sample:oop:evaluate": "npm run build && node --import tsx src/benchmark/evaluate.ts --cases conditions/sample-conditions    --out benchmark/results-sample-evaluate-oop.json",
+    "bench:sample:oop:simplify": "npm run build && node --import tsx src/benchmark/simplify.ts --cases conditions/sample-conditions    --out benchmark/results-sample-simplify-oop.json",
+    "bench:synthetic:oop:evaluate": "npm run build && node --import tsx src/benchmark/evaluate.ts --cases conditions/synthetic-conditions --out benchmark/results-synthetic-evaluate-oop.json",
+    "bench:synthetic:oop:simplify": "npm run build && node --import tsx src/benchmark/simplify.ts --cases conditions/synthetic-conditions --out benchmark/results-synthetic-simplify-oop.json",
+    "bench:sample:bytecode:evaluate": "npm run build && node --import tsx src/benchmark/evaluate.ts --cases conditions/sample-conditions    --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-sample-evaluate-bytecode.json",
+    "bench:sample:bytecode:simplify": "npm run build && node --import tsx src/benchmark/simplify.ts --cases conditions/sample-conditions    --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-sample-simplify-bytecode.json",
+    "bench:synthetic:bytecode:evaluate": "npm run build && node --import tsx src/benchmark/evaluate.ts --cases conditions/synthetic-conditions --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-synthetic-evaluate-bytecode.json",
+    "bench:synthetic:bytecode:simplify": "npm run build && node --import tsx src/benchmark/simplify.ts --cases conditions/synthetic-conditions --options '{\"evaluator\":\"bytecode\"}' --out benchmark/results-synthetic-simplify-bytecode.json",
+    "bench:sample:compare:evaluate": "node --import tsx src/benchmark/compare.ts benchmark/results-sample-evaluate-oop.json    benchmark/results-sample-evaluate-bytecode.json",
+    "bench:synthetic:compare:evaluate": "node --import tsx src/benchmark/compare.ts benchmark/results-synthetic-evaluate-oop.json benchmark/results-synthetic-evaluate-bytecode.json",
+    "bench:sample:compare:simplify": "node --import tsx src/benchmark/compare.ts benchmark/results-sample-simplify-oop.json    benchmark/results-sample-simplify-bytecode.json",
+    "bench:synthetic:compare:simplify": "node --import tsx src/benchmark/compare.ts benchmark/results-synthetic-simplify-oop.json benchmark/results-synthetic-simplify-bytecode.json",
+    "bench:sample:report:evaluate": "node --import tsx src/benchmark/report.ts benchmark/results-sample-evaluate-oop.json    benchmark/results-sample-evaluate-bytecode.json    --op evaluate --out benchmark/report-sample-evaluate.md",
+    "bench:synthetic:report:evaluate": "node --import tsx src/benchmark/report.ts benchmark/results-synthetic-evaluate-oop.json benchmark/results-synthetic-evaluate-bytecode.json --op evaluate --out benchmark/report-synthetic-evaluate.md",
+    "bench:sample:report:full:evaluate": "node --import tsx src/benchmark/report.ts benchmark/results-sample-evaluate-oop.json    benchmark/results-sample-evaluate-bytecode.json    --op evaluate --full --out benchmark/report-sample-evaluate-full.md",
+    "bench:synthetic:report:full:evaluate": "node --import tsx src/benchmark/report.ts benchmark/results-synthetic-evaluate-oop.json benchmark/results-synthetic-evaluate-bytecode.json --op evaluate --full --out benchmark/report-synthetic-evaluate-full.md",
+    "bench:sample:report:simplify": "node --import tsx src/benchmark/report.ts benchmark/results-sample-simplify-oop.json    benchmark/results-sample-simplify-bytecode.json    --op simplify --out benchmark/report-sample-simplify.md",
+    "bench:synthetic:report:simplify": "node --import tsx src/benchmark/report.ts benchmark/results-synthetic-simplify-oop.json benchmark/results-synthetic-simplify-bytecode.json --op simplify --out benchmark/report-synthetic-simplify.md",
+    "bench:sample:report:full:simplify": "node --import tsx src/benchmark/report.ts benchmark/results-sample-simplify-oop.json    benchmark/results-sample-simplify-bytecode.json    --op simplify --full --out benchmark/report-sample-simplify-full.md",
+    "bench:synthetic:report:full:simplify": "node --import tsx src/benchmark/report.ts benchmark/results-synthetic-simplify-oop.json benchmark/results-synthetic-simplify-bytecode.json --op simplify --full --out benchmark/report-synthetic-simplify-full.md",
     "get-bytecode": "node --import tsx src/bytecode/get-bytecode.ts",
     "debug-bytecode": "node --import tsx src/tools/debugger.ts"
   },

package/readme.md

@@ -8,33 +8,37 @@
   <div align="center">
     <h3 align="center">illogical</h3>
   </div>
+</div>
 
-[![build status](https://github.com/briza-insurance/illogical/actions/workflows/test.yml/badge.svg)](https://github.com/briza-insurance/illogical/actions?branch=master)
-[![npm version](https://badge.fury.io/js/@briza%2Fillogical.svg?icon=si%3Anpm)](https://badge.fury.io/js/@briza%2Fillogical)
-[![install size](https://packagephobia.com/badge?p=@briza/illogical)](https://packagephobia.com/result?p=@briza/illogical)
-![zero dependencies](https://img.shields.io/badge/0-dependencies-green)
-![npm downloads](https://img.shields.io/npm/dm/%40briza%2Fillogical)
-
+<div align="center">
+  <p>
+  **illogical** is a JSON DSL (domain-specific language) for expressing and evaluating business rules in the insurance industry. Underwriters use illogical to model business rules for their question sets, enabling distributors to render great user experiences.
+  </p>
 </div>
 
 <div align="center">
-<p>
-<br />
-JSON DSL for expressing and evaluating business rules. Underwriters use illogical to model business rules for their question sets, enabling distributors to render great user experiences.
-</p>
+  [![build status](https://github.com/briza-insurance/illogical/actions/workflows/test.yml/badge.svg)](https://github.com/briza-insurance/illogical/actions?branch=master)
+  [![npm version](https://badge.fury.io/js/@briza%2Fillogical.svg?icon=si%3Anpm)](https://badge.fury.io/js/@briza%2Fillogical)
+  [![install size](https://packagephobia.com/badge?p=@briza/illogical)](https://packagephobia.com/result?p=@briza/illogical)
+  ![zero dependencies](https://img.shields.io/badge/0-dependencies-green)
+  ![npm downloads](https://img.shields.io/npm/dm/%40briza%2Fillogical)
 </div>
 
 ---
 
-This project is designed such that business rules can be shared between the front-end and back-end, serialized in JSON.
+## 🚀 Getting Started
 
-## 🚀 Get Started
+Get up and running with illogical in just a few steps.
+
+### Installation
 
 ```sh
 # install illogical
 npm install @briza/illogical
 ```
 
+### Basic Usage
+
 ```js
 // Import the illogical engine
 import Engine from '@briza/illogical'
@@ -65,9 +69,11 @@ engine.evaluate(['==', '$age.(String)', '21'], ctx) // true
 engine.evaluate(['AND', ['>', '$age', 20], ['==', '$name', 'peter']]) // true
 ```
 
-## 🖼️ Resources
+## 📚 Documentation
 
-Understand supported expressions:
+### Core Concepts
+
+Explore the supported expressions and their usage:
 
 - [Comparison Expressions](./specs/comparison-expressions.md)
 - [Logical Expressions](./specs/logical-expressions.md)
@@ -75,19 +81,25 @@ Understand supported expressions:
 - [Evaluation Data Context](./specs/evaluation-data-context.md)
 - [Operand Types](./specs/operand-types.md)
 
-Learn about usages:
+### API Reference
+
+Learn how to use the engine and its methods:
 
 - [Evaluate](./specs/evaluate.md)
 - [Statement](./specs/statement.md)
 - [Parse](./specs/parse.md)
 - [Simplify](./specs/simplify.md)
 
+### Customization
+
 Customize the engine and the documentation:
 
 - [Engine Options](./specs/engine.md)
 - [Code Documentation](https://briza-insurance.github.io/illogical/index.html)
 
-Bytecode evaluation and debugging tools:
+### Development Tools
+
+For advanced usage like bytecode evaluation and debugging:
 
 - [Bytecode Evaluator](./specs/bytecode-evaluator.md)
 - [Debugger Tools](./specs/debugger-tools.md)

package/types/bytecode/refs.d.ts

@@ -71,3 +71,4 @@ export declare function resolveDynamic(key: string, dataType: DataType | undefin
  * (OP_OVERLAP_SCAN_REFS_CONST, OP_OR_AND_IN_CONST_2).
  */
 export declare function resolveCompactRef(ref: CompactRef, ctx: Context): Result;
+export declare function getKeyFromCompactRef(ref: CompactRef): string;

package/types/common/type-check.d.ts

@@ -1,3 +1,6 @@
+import { Operand } from '../operand/index.js';
+import { Reference } from '../operand/reference.js';
+import { Value } from '../operand/value.js';
 import { Evaluable, Result } from './evaluable.js';
 /**
  * Is number predicate.
@@ -45,3 +48,5 @@ export declare function areAllResults(values: (Result | Evaluable)[]): values is
 export declare function areAllNumbers(results: Result[]): results is number[];
 export declare function isUndefined(value: unknown): value is undefined;
 export declare function isNull(value: unknown): value is null;
+export declare function isReference(operand: Operand): operand is Reference;
+export declare function isValue(operand: Operand): operand is Value;

package/types/common/util.d.ts

@@ -14,3 +14,9 @@ export declare const toString: (value: Result) => string | undefined;
  * @param value value to be converted to number
  */
 export declare const toDateNumber: (value: Result) => number;
+export declare const formatDateNumber: (dateNumber: number) => string;
+export type DateDuration = {
+    amount: number;
+    unit: 'd' | 'm' | 'y';
+};
+export declare const toDateDuration: (value: Result) => DateDuration | undefined;

package/types/expression/arithmetic/dateArithmeticTypeCheck.d.ts

@@ -0,0 +1,2 @@
+import { Operand } from '../../operand/index.js';
+export declare const dateArithmeticTypeCheck: (...operands: Operand[]) => void;

package/types/expression/arithmetic/index.d.ts

@@ -1,4 +1,5 @@
 import { Context, Evaluable, EvaluableType, Result, SimplifyArgs } from '../../common/evaluable.js';
+import { DateDuration } from '../../common/util.js';
 import { Operand } from '../../operand/index.js';
 import { ExpressionInput } from '../../parser/index.js';
 import { Options } from '../../parser/options.js';
@@ -27,6 +28,7 @@ export declare abstract class Arithmetic implements Evaluable {
      *   array of numbers
      */
     protected getResultValues(results: Result[]): number[] | false;
+    protected getDateCalculationResults(results: Result[]): [number, ...DateDuration[]] | false;
     /**
      * Performs the arithmetic operation on the operands evaluated values.
      * @param {Result[]} results Operand result values.

package/types/expression/arithmetic/mutateDateWithDuration.d.ts

@@ -0,0 +1,2 @@
+import { DateDuration } from '../../common/util.js';
+export declare const mutateDateWithDuration: (dateNumber: number, duration: DateDuration, operator: "sum" | "subtract") => number;