Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@time-loop/hot-formula-parser",
"version": "4.1.2",
"version": "4.2.0",
"description": "Formula parser",
"type": "commonjs",
"main": "dist/index.js",
Expand Down
52 changes: 52 additions & 0 deletions src/clickup/formulajsProxy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import * as formulajs from '@formulajs/formulajs';

const hasNil = (...args: unknown[]) =>
args.some((arg) => arg === null || arg === undefined || arg === '' || arg === false);
const nullToZero = (arg: unknown) => (hasNil(arg) ? 0 : arg);

const overrides = {
DATE: (year: unknown, month: unknown, day: unknown) =>
hasNil(year, month, day) ? Number.NaN : formulajs.DATE(year, month, day),
DATEVALUE: (dateText: unknown) => (hasNil(dateText) ? Number.NaN : formulajs.DATEVALUE(dateText)),
DAY: (date: unknown) => (hasNil(date) ? Number.NaN : formulajs.DAY(date)),
DAYS: (startDate: unknown, endDate: unknown) =>
hasNil(startDate, endDate) ? Number.NaN : formulajs.DAYS(startDate, endDate),
DAYS360: (startDate: unknown, endDate: unknown, method: unknown) =>
hasNil(startDate, endDate) ? Number.NaN : formulajs.DAYS360(startDate, endDate, method),
EDATE: (startDate: unknown, months: unknown) =>
hasNil(startDate) ? Number.NaN : formulajs.EDATE(startDate, nullToZero(months)),
EOMONTH: (startDate: unknown, months: unknown) =>
hasNil(startDate) ? Number.NaN : formulajs.EOMONTH(startDate, nullToZero(months)),
HOUR: (date: unknown) => (hasNil(date) ? Number.NaN : formulajs.HOUR(date)),
INTERVAL: (seconds: unknown) => formulajs.INTERVAL(nullToZero(seconds)),
ISOWEEKNUM: (date: unknown) => (hasNil(date) ? Number.NaN : formulajs.ISOWEEKNUM(date)),
MINUTE: (serialNumber: unknown) => (hasNil(serialNumber) ? Number.NaN : formulajs.MINUTE(serialNumber)),
MONTH: (date: unknown) => (hasNil(date) ? Number.NaN : formulajs.MONTH(date)),
SECOND: (serialNumber: unknown) => (hasNil(serialNumber) ? Number.NaN : formulajs.SECOND(serialNumber)),
TIME: (hour: unknown, minute: unknown, second: unknown) =>
hasNil(hour, minute, second) ? Number.NaN : formulajs.TIME(hour, minute, second),
TIMEVALUE: (timeText: unknown) => (hasNil(timeText) ? Number.NaN : formulajs.TIMEVALUE(timeText)),
WEEKDAY: (serialNumber: unknown, returnType: unknown) =>
hasNil(serialNumber) ? Number.NaN : formulajs.WEEKDAY(serialNumber, returnType),
WEEKNUM: (serialNumber: unknown, returnType: unknown) =>
hasNil(serialNumber) ? Number.NaN : formulajs.WEEKNUM(serialNumber, returnType),
YEAR: (date: unknown) => (hasNil(date) ? Number.NaN : formulajs.YEAR(date)),
YEARFRAC: (startDate: unknown, endDate: unknown, basis: unknown) =>
hasNil(startDate, endDate) ? Number.NaN : formulajs.YEARFRAC(startDate, endDate, basis),
WORKDAY: (startDate: unknown, days: unknown, holidays: unknown) =>
hasNil(startDate) ? Number.NaN : formulajs.WORKDAY(startDate, nullToZero(days), holidays),
NETWORKDAYS: (startDate: unknown, endDate: unknown, holidays: unknown) =>
hasNil(startDate, endDate) ? Number.NaN : formulajs.NETWORKDAYS(startDate, endDate, holidays),
};

export const formulajsProxy = new Proxy(formulajs, {
get: (target, prop) => {
if (prop in overrides) {
return overrides[prop as keyof typeof overrides];
}
if (prop in target) {
return target[prop];
}
return null;
},
});
2 changes: 1 addition & 1 deletion src/evaluate-by-operator/operator/formula-function.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as formulajs from '@formulajs/formulajs';
import { formulajsProxy as formulajs } from '../../clickup/formulajsProxy';
import SUPPORTED_FORMULAS from '../../supported-formulas';
import { ERROR_NAME } from '../../error';

Expand Down
2 changes: 1 addition & 1 deletion src/helper/number.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as formulajs from '@formulajs/formulajs';
import { formulajsProxy as formulajs } from '../clickup/formulajsProxy';
import splitFormula from './formula';
import { getNumberOfDaysSinceEpoch, isDate } from './date';

Expand Down
Loading
Loading