@recursyve/nestjs-data-filter 8.4.1 → 8.4.2

package/lib/filter/filters/date.filter.d.ts

@@ -3,10 +3,14 @@ import { QueryRuleModel } from "../models";
 import { FilterOperatorTypes } from "../operators";
 import { FilterType } from "../type";
 import { BaseFilterDefinition, Filter } from "./filter";
+export interface DateFilterDefinition {
+    defaultTimezone?: string;
+}
 export declare class DateFilter extends Filter {
     type: FilterType;
     operators: FilterOperatorTypes[];
-    constructor(definition: BaseFilterDefinition);
+    private readonly defaultTimezone;
+    constructor(definition: BaseFilterDefinition & DateFilterDefinition);
     getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions>;
     private getEqualWhereOptions;
     private getNotEqualWhereOptions;

package/lib/filter/filters/date.filter.js

@@ -5,7 +5,8 @@ const sequelize_1 = require("sequelize");
 const operators_1 = require("../operators");
 const type_1 = require("../type");
 const filter_1 = require("./filter");
-const moment = require("moment");
+const date_fns_1 = require("date-fns");
+const date_fns_tz_1 = require("date-fns-tz");
 // Filters a row by exact date given in the rules. We strip the time from the date.
 //
 // Depending on the inclusivity of your request we use the start of day or end of day, for example if the rule's value
@@ -17,36 +18,28 @@ const moment = require("moment");
 // timeframe by one day for each side you don't want to include.
 class DateFilter extends filter_1.Filter {
     constructor(definition) {
+        var _a;
         super(definition);
         this.type = type_1.FilterType.Date;
         this.operators = [...operators_1.DateOperators];
+        this.defaultTimezone = (_a = definition.defaultTimezone) !== null && _a !== void 0 ? _a : "America/Montreal";
     }
     async getWhereOptions(rule) {
+        // TODO: Check if the client sends us a timezone
+        const offsetMilliseconds = (0, date_fns_tz_1.getTimezoneOffset)(this.defaultTimezone);
         if (rule.operation === operators_1.FilterOperatorTypes.Between || rule.operation === operators_1.FilterOperatorTypes.NotBetween) {
             const values = [
-                moment(rule.value[0])
-                    .startOf("day")
-                    .utcOffset(-5, true)
-                    .format(),
-                moment(rule.value[1])
-                    .endOf("day")
-                    .utcOffset(-5, true)
-                    .format()
+                (0, date_fns_1.addMilliseconds)((0, date_fns_1.startOfDay)((0, date_fns_1.parseJSON)(rule.value[0])), offsetMilliseconds).toISOString(),
+                (0, date_fns_1.addMilliseconds)((0, date_fns_1.endOfDay)((0, date_fns_1.parseJSON)(rule.value[1])), offsetMilliseconds).toISOString()
             ];
             return super.getWhereOptions({
                 ...rule,
                 value: values
             });
         }
-        // TODO: Do not hard code timezone offset
-        const start = moment(rule.value)
-            .startOf("day")
-            .utcOffset(-5, true)
-            .format();
-        const end = moment(rule.value)
-            .endOf("day")
-            .utcOffset(-5, true)
-            .format();
+        const parsedValue = (0, date_fns_1.parseJSON)(rule.value);
+        const start = (0, date_fns_1.addMilliseconds)((0, date_fns_1.startOfDay)(parsedValue), offsetMilliseconds).toISOString();
+        const end = (0, date_fns_1.addMilliseconds)((0, date_fns_1.endOfDay)(parsedValue), offsetMilliseconds).toISOString();
         switch (rule.operation) {
             case operators_1.FilterOperatorTypes.Equal:
                 return this.getEqualWhereOptions(rule, start, end);
@@ -118,4 +111,4 @@ class DateFilter extends filter_1.Filter {
 }
 exports.DateFilter = DateFilter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/filters/date.filter.ts"],"names":[],"mappings":";;;AAAA,yCAA6C;AAE7C,4CAAkE;AAClE,kCAAqC;AACrC,qCAAwD;AACxD,iCAAiC;AAEjC,mFAAmF;AACnF,EAAE;AACF,sHAAsH;AACtH,4BAA4B;AAC5B,sGAAsG;AACtG,gGAAgG;AAChG,EAAE;AACF,wHAAwH;AACxH,gEAAgE;AAChE,MAAa,UAAW,SAAQ,eAAM;IAIlC,YAAY,UAAgC;QACxC,KAAK,CAAC,UAAU,CAAC,CAAC;QAJf,SAAI,GAAG,iBAAU,CAAC,IAAI,CAAC;QACvB,cAAS,GAAG,CAAC,GAAG,yBAAa,CAAC,CAAC;IAItC,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,IAAoB;QAC7C,IAAI,IAAI,CAAC,SAAS,KAAK,+BAAmB,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,KAAK,+BAAmB,CAAC,UAAU,EAAE;YACrG,MAAM,MAAM,GAAG;gBACX,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;qBAChB,OAAO,CAAC,KAAK,CAAC;qBACd,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;qBACnB,MAAM,EAAE;gBACb,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;qBAChB,KAAK,CAAC,KAAK,CAAC;qBACZ,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;qBACnB,MAAM,EAAE;aAChB,CAAC;YACF,OAAO,KAAK,CAAC,eAAe,CAAC;gBACzB,GAAG,IAAI;gBACP,KAAK,EAAE,MAAM;aAChB,CAAC,CAAC;SACN;QAED,yCAAyC;QACzC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aAC3B,OAAO,CAAC,KAAK,CAAC;aACd,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;aACnB,MAAM,EAAE,CAAC;QACd,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,KAAK,CAAC;aACZ,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;aACnB,MAAM,EAAE,CAAC;QACd,QAAQ,IAAI,CAAC,SAAS,EAAE;YACpB,KAAK,+BAAmB,CAAC,KAAK;gBAC1B,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YACvD,KAAK,+BAAmB,CAAC,QAAQ;gBAC7B,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC1D,KAAK,+BAAmB,CAAC,IAAI;gBACzB,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACjD,KAAK,+BAAmB,CAAC,WAAW;gBAChC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACtD,KAAK,+BAAmB,CAAC,OAAO;gBAC5B,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAClD,KAAK,+BAAmB,CAAC,cAAc;gBACnC,OAAO,IAAI,CAAC,6BAA6B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC3D;gBACI,OAAO,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;SAC1C;IACL,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,IAAoB,EAAE,KAAa,EAAE,GAAW;QAC/E,OAAO,KAAK,CAAC,eAAe,CAAC;YACzB,SAAS,EAAE,+BAAmB,CAAC,OAAO;YACtC,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC;YACnB,EAAE,EAAE,IAAI,CAAC,EAAE;SACd,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,IAAoB,EAAE,KAAa,EAAE,GAAW;QAClF,OAAO;YACH,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE;gBACL,MAAM,KAAK,CAAC,eAAe,CAAC;oBACxB,SAAS,EAAE,+BAAmB,CAAC,IAAI;oBACnC,KAAK,EAAE,KAAK;oBACZ,EAAE,EAAE,IAAI,CAAC,EAAE;iBACd,CAAC;gBACF,MAAM,KAAK,CAAC,eAAe,CAAC;oBACxB,SAAS,EAAE,+BAAmB,CAAC,OAAO;oBACtC,KAAK,EAAE,GAAG;oBACV,EAAE,EAAE,IAAI,CAAC,EAAE;iBACd,CAAC;aACL;SACJ,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,IAAoB,EAAE,KAAa;QACjE,OAAO,KAAK,CAAC,eAAe,CAAC;YACzB,SAAS,EAAE,+BAAmB,CAAC,IAAI;YACnC,KAAK,EAAE,KAAK;YACZ,EAAE,EAAE,IAAI,CAAC,EAAE;SACd,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,IAAoB,EAAE,GAAW;QACtE,OAAO,KAAK,CAAC,eAAe,CAAC;YACzB,SAAS,EAAE,+BAAmB,CAAC,WAAW;YAC1C,KAAK,EAAE,GAAG;YACV,EAAE,EAAE,IAAI,CAAC,EAAE;SACd,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,IAAoB,EAAE,GAAW;QAClE,OAAO,KAAK,CAAC,eAAe,CAAC;YACzB,SAAS,EAAE,+BAAmB,CAAC,OAAO;YACtC,KAAK,EAAE,GAAG;YACV,EAAE,EAAE,IAAI,CAAC,EAAE;SACd,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAAC,IAAoB,EAAE,KAAa;QAC3E,OAAO,KAAK,CAAC,eAAe,CAAC;YACzB,SAAS,EAAE,+BAAmB,CAAC,cAAc;YAC7C,KAAK,EAAE,KAAK;YACZ,EAAE,EAAE,IAAI,CAAC,EAAE;SACd,CAAC,CAAC;IACP,CAAC;CACJ;AA7GD,gCA6GC","file":"lib/filter/filters/date.filter.js","sourcesContent":["import { Op, WhereOptions } from \"sequelize\";\nimport { QueryRuleModel } from \"../models\";\nimport { DateOperators, FilterOperatorTypes } from \"../operators\";\nimport { FilterType } from \"../type\";\nimport { BaseFilterDefinition, Filter } from \"./filter\";\nimport * as moment from \"moment\";\n\n// Filters a row by exact date given in the rules. We strip the time from the date.\n//\n// Depending on the inclusivity of your request we use the start of day or end of day, for example if the rule's value\n// is \"2020-03-06T00:55:12\";\n//  - And its operator is LessOrEqual we will output \"< 2020-03-06T00:00:00\" to exclude the given day.\n//  - And its operator is Less, we will output \"< 2020-03-06T23:59:59\" to include the given day.\n//\n// For Between and NotBetween operators, we always include the given first day and last day, so make sure to shrink your\n// timeframe by one day for each side you don't want to include.\nexport class DateFilter extends Filter {\n    public type = FilterType.Date;\n    public operators = [...DateOperators];\n\n    constructor(definition: BaseFilterDefinition) {\n        super(definition);\n    }\n\n    public async getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions> {\n        if (rule.operation === FilterOperatorTypes.Between || rule.operation === FilterOperatorTypes.NotBetween) {\n            const values = [\n                moment(rule.value[0])\n                    .startOf(\"day\")\n                    .utcOffset(-5, true)\n                    .format(),\n                moment(rule.value[1])\n                    .endOf(\"day\")\n                    .utcOffset(-5, true)\n                    .format()\n            ];\n            return super.getWhereOptions({\n                ...rule,\n                value: values\n            });\n        }\n\n        // TODO: Do not hard code timezone offset\n        const start = moment(rule.value)\n            .startOf(\"day\")\n            .utcOffset(-5, true)\n            .format();\n        const end = moment(rule.value)\n            .endOf(\"day\")\n            .utcOffset(-5, true)\n            .format();\n        switch (rule.operation) {\n            case FilterOperatorTypes.Equal:\n                return this.getEqualWhereOptions(rule, start, end);\n            case FilterOperatorTypes.NotEqual:\n                return this.getNotEqualWhereOptions(rule, start, end);\n            case FilterOperatorTypes.Less:\n                return this.getLessWhereOptions(rule, start);\n            case FilterOperatorTypes.LessOrEqual:\n                return this.getLessOrEqualWhereOptions(rule, end);\n            case FilterOperatorTypes.Greater:\n                return this.getGreaterWhereOptions(rule, end);\n            case FilterOperatorTypes.GreaterOrEqual:\n                return this.getGreaterOrEqualWhereOptions(rule, start);\n            default:\n                return super.getWhereOptions(rule);\n        }\n    }\n\n    private async getEqualWhereOptions(rule: QueryRuleModel, start: string, end: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.Between,\n            value: [start, end],\n            id: rule.id\n        });\n    }\n\n    private async getNotEqualWhereOptions(rule: QueryRuleModel, start: string, end: string): Promise<WhereOptions> {\n        return {\n            [Op.or]: [\n                await super.getWhereOptions({\n                    operation: FilterOperatorTypes.Less,\n                    value: start,\n                    id: rule.id\n                }),\n                await super.getWhereOptions({\n                    operation: FilterOperatorTypes.Greater,\n                    value: end,\n                    id: rule.id\n                })\n            ]\n        };\n    }\n\n    private async getLessWhereOptions(rule: QueryRuleModel, start: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.Less,\n            value: start,\n            id: rule.id\n        });\n    }\n\n    private async getLessOrEqualWhereOptions(rule: QueryRuleModel, end: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.LessOrEqual,\n            value: end,\n            id: rule.id\n        });\n    }\n\n    private async getGreaterWhereOptions(rule: QueryRuleModel, end: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.Greater,\n            value: end,\n            id: rule.id\n        });\n    }\n\n    private async getGreaterOrEqualWhereOptions(rule: QueryRuleModel, start: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.GreaterOrEqual,\n            value: start,\n            id: rule.id\n        });\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/filters/date.filter.ts"],"names":[],"mappings":"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","file":"lib/filter/filters/date.filter.js","sourcesContent":["import { Op, WhereOptions } from \"sequelize\";\nimport { QueryRuleModel } from \"../models\";\nimport { DateOperators, FilterOperatorTypes } from \"../operators\";\nimport { FilterType } from \"../type\";\nimport { BaseFilterDefinition, Filter } from \"./filter\";\nimport { addMilliseconds, endOfDay, parseJSON, startOfDay } from \"date-fns\";\nimport { getTimezoneOffset } from \"date-fns-tz\";\n\nexport interface DateFilterDefinition {\n    defaultTimezone?: string;\n}\n\n// Filters a row by exact date given in the rules. We strip the time from the date.\n//\n// Depending on the inclusivity of your request we use the start of day or end of day, for example if the rule's value\n// is \"2020-03-06T00:55:12\";\n//  - And its operator is LessOrEqual we will output \"< 2020-03-06T00:00:00\" to exclude the given day.\n//  - And its operator is Less, we will output \"< 2020-03-06T23:59:59\" to include the given day.\n//\n// For Between and NotBetween operators, we always include the given first day and last day, so make sure to shrink your\n// timeframe by one day for each side you don't want to include.\nexport class DateFilter extends Filter {\n    public type = FilterType.Date;\n    public operators = [...DateOperators];\n\n    private readonly defaultTimezone;\n\n    constructor(definition: BaseFilterDefinition & DateFilterDefinition) {\n        super(definition);\n\n        this.defaultTimezone = definition.defaultTimezone ?? \"America/Montreal\";\n    }\n\n    public async getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions> {\n        // TODO: Check if the client sends us a timezone\n        const offsetMilliseconds = getTimezoneOffset(this.defaultTimezone);\n\n        if (rule.operation === FilterOperatorTypes.Between || rule.operation === FilterOperatorTypes.NotBetween) {\n            const values = [\n                addMilliseconds(startOfDay(parseJSON(rule.value[0])), offsetMilliseconds).toISOString(),\n                addMilliseconds(endOfDay(parseJSON(rule.value[1])), offsetMilliseconds).toISOString()\n            ];\n            return super.getWhereOptions({\n                ...rule,\n                value: values\n            });\n        }\n\n        const parsedValue = parseJSON(rule.value as any);\n        const start = addMilliseconds(startOfDay(parsedValue), offsetMilliseconds).toISOString()\n        const end = addMilliseconds(endOfDay(parsedValue), offsetMilliseconds).toISOString()\n\n        switch (rule.operation) {\n            case FilterOperatorTypes.Equal:\n                return this.getEqualWhereOptions(rule, start, end);\n            case FilterOperatorTypes.NotEqual:\n                return this.getNotEqualWhereOptions(rule, start, end);\n            case FilterOperatorTypes.Less:\n                return this.getLessWhereOptions(rule, start);\n            case FilterOperatorTypes.LessOrEqual:\n                return this.getLessOrEqualWhereOptions(rule, end);\n            case FilterOperatorTypes.Greater:\n                return this.getGreaterWhereOptions(rule, end);\n            case FilterOperatorTypes.GreaterOrEqual:\n                return this.getGreaterOrEqualWhereOptions(rule, start);\n            default:\n                return super.getWhereOptions(rule);\n        }\n    }\n\n    private async getEqualWhereOptions(rule: QueryRuleModel, start: string, end: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.Between,\n            value: [start, end],\n            id: rule.id\n        });\n    }\n\n    private async getNotEqualWhereOptions(rule: QueryRuleModel, start: string, end: string): Promise<WhereOptions> {\n        return {\n            [Op.or]: [\n                await super.getWhereOptions({\n                    operation: FilterOperatorTypes.Less,\n                    value: start,\n                    id: rule.id\n                }),\n                await super.getWhereOptions({\n                    operation: FilterOperatorTypes.Greater,\n                    value: end,\n                    id: rule.id\n                })\n            ]\n        };\n    }\n\n    private async getLessWhereOptions(rule: QueryRuleModel, start: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.Less,\n            value: start,\n            id: rule.id\n        });\n    }\n\n    private async getLessOrEqualWhereOptions(rule: QueryRuleModel, end: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.LessOrEqual,\n            value: end,\n            id: rule.id\n        });\n    }\n\n    private async getGreaterWhereOptions(rule: QueryRuleModel, end: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.Greater,\n            value: end,\n            id: rule.id\n        });\n    }\n\n    private async getGreaterOrEqualWhereOptions(rule: QueryRuleModel, start: string): Promise<WhereOptions> {\n        return super.getWhereOptions({\n            operation: FilterOperatorTypes.GreaterOrEqual,\n            value: start,\n            id: rule.id\n        });\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recursyve/nestjs-data-filter",
-    "version": "8.4.1",
+    "version": "8.4.2",
     "description": "NestJs DataFilter library",
     "main": "index.js",
     "scripts": {
@@ -22,9 +22,10 @@
         "@nestjs/common": ">=8.0.0",
         "@nestjs/core": ">=8.0.0",
         "@recursyve/nestjs-common": ">=8.0.0",
-        "moment": "^2.29.0",
         "sequelize": ">=6.19.0",
-        "sequelize-typescript": ">=2.1.0"
+        "sequelize-typescript": ">=2.1.0",
+        "date-fns": "^2.28.0",
+        "date-fns-tz": "^1.3.4"
     },
     "devDependencies": {
         "@nestjs/common": "^8.2.6",