@frontegg/entitlements-javascript-commons 1.0.0-alpha.13 → 1.0.0-alpha.15

package/dist/operations/date/sanitizers.d.ts

@@ -1,5 +1,7 @@
 import { Sanitizer, SanitizersMapper } from '../types';
 import { BetweenDateOperationPayload, DateOperationPayload, SingleDateOperationPayload } from './types';
+export declare const sanitizeDateValue: (value: Date | string | number) => Date;
+export declare const isValidDate: (value: unknown) => boolean;
 export declare const sanitizeSingleDate: Sanitizer<SingleDateOperationPayload>;
 export declare const sanitizeDateRange: Sanitizer<BetweenDateOperationPayload>;
 export declare const DateSanitizersMapper: SanitizersMapper<DateOperationPayload>;

package/dist/operations/date/sanitizers.js

@@ -1,9 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DateSanitizersMapper = exports.sanitizeDateRange = exports.sanitizeSingleDate = void 0;
+exports.DateSanitizersMapper = exports.sanitizeDateRange = exports.sanitizeSingleDate = exports.isValidDate = exports.sanitizeDateValue = void 0;
 const types_1 = require("../types");
+const sanitizeDateValue = (value) => {
+    return new Date(value);
+};
+exports.sanitizeDateValue = sanitizeDateValue;
+const isValidDate = (value) => value instanceof Date && !isNaN(value);
+exports.isValidDate = isValidDate;
 const sanitizeSingleDate = (value) => {
-    const sanitizedValue = value.date ? { date: value.date } : undefined;
+    const sanitizedDateValue = value.date ? (0, exports.sanitizeDateValue)(value.date) : undefined;
+    const sanitizedValue = sanitizedDateValue && (0, exports.isValidDate)(sanitizedDateValue) ? { date: sanitizedDateValue } : undefined;
     return {
         isSanitized: !!sanitizedValue,
         sanitizedValue,
@@ -11,7 +18,11 @@ const sanitizeSingleDate = (value) => {
 };
 exports.sanitizeSingleDate = sanitizeSingleDate;
 const sanitizeDateRange = (value) => {
-    const sanitizedValue = value.start && value.end ? { start: value.start, end: value.end } : undefined;
+    const sanitizedStartValue = value.start ? (0, exports.sanitizeDateValue)(value.start) : undefined;
+    const sanitizedEndValue = value.end ? (0, exports.sanitizeDateValue)(value.end) : undefined;
+    const sanitizedValue = sanitizedStartValue && sanitizedEndValue && (0, exports.isValidDate)(sanitizedStartValue) && (0, exports.isValidDate)(sanitizedEndValue)
+        ? { start: sanitizedStartValue, end: sanitizedEndValue }
+        : undefined;
     return {
         isSanitized: !!sanitizedValue,
         sanitizedValue,
@@ -20,8 +31,8 @@ const sanitizeDateRange = (value) => {
 exports.sanitizeDateRange = sanitizeDateRange;
 exports.DateSanitizersMapper = {
     [types_1.OperationEnum.On]: exports.sanitizeSingleDate,
-    [types_1.OperationEnum.OnOrAfter]: exports.sanitizeDateRange,
+    [types_1.OperationEnum.OnOrAfter]: exports.sanitizeSingleDate,
     [types_1.OperationEnum.OnOrBefore]: exports.sanitizeSingleDate,
-    [types_1.OperationEnum.BetweenDate]: exports.sanitizeSingleDate,
+    [types_1.OperationEnum.BetweenDate]: exports.sanitizeDateRange,
 };
 //# sourceMappingURL=sanitizers.js.map

package/dist/operations/date/sanitizers.js.map

@@ -1 +1 @@
-{"version":3,"file":"sanitizers.js","sourceRoot":"","sources":["../../../src/operations/date/sanitizers.ts"],"names":[],"mappings":";;;AAAA,oCAAsE;AAG/D,MAAM,kBAAkB,GAA0C,CAAC,KAAK,EAAE,EAAE;IACjF,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAY,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAE7E,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,cAAc;QAC7B,cAAc;KACf,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,kBAAkB,sBAO7B;AAEK,MAAM,iBAAiB,GAA2C,CAAC,KAAK,EAAE,EAAE;IACjF,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAa,EAAE,GAAG,EAAE,KAAK,CAAC,GAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAErH,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,cAAc;QAC7B,cAAc;KACf,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,iBAAiB,qBAO5B;AAEW,QAAA,oBAAoB,GAA2C;IAC1E,CAAC,qBAAa,CAAC,EAAE,CAAC,EAAE,0BAAkB;IACtC,CAAC,qBAAa,CAAC,SAAS,CAAC,EAAE,yBAAiB;IAC5C,CAAC,qBAAa,CAAC,UAAU,CAAC,EAAE,0BAAkB;IAC9C,CAAC,qBAAa,CAAC,WAAW,CAAC,EAAE,0BAAkB;CAChD,CAAC"}
+{"version":3,"file":"sanitizers.js","sourceRoot":"","sources":["../../../src/operations/date/sanitizers.ts"],"names":[],"mappings":";;;AAAA,oCAAsE;AAK/D,MAAM,iBAAiB,GAAG,CAAC,KAA6B,EAAQ,EAAE;IACvE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B;AAEK,MAAM,WAAW,GAAG,CAAC,KAAc,EAAW,EAAE,CAAC,KAAK,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,KAA0B,CAAC,CAAC;AAAvG,QAAA,WAAW,eAA4F;AAE7G,MAAM,kBAAkB,GAA0C,CAAC,KAAK,EAAE,EAAE;IACjF,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,KAAK,CAAC,IAAoB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClG,MAAM,cAAc,GAClB,kBAAkB,IAAI,IAAA,mBAAW,EAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAEnG,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,cAAc;QAC7B,cAAc;KACf,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B;AAEK,MAAM,iBAAiB,GAA2C,CAAC,KAAK,EAAE,EAAE;IACjF,MAAM,mBAAmB,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,KAAK,CAAC,KAAqB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACrG,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,KAAK,CAAC,GAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/F,MAAM,cAAc,GAClB,mBAAmB,IAAI,iBAAiB,IAAI,IAAA,mBAAW,EAAC,mBAAmB,CAAC,IAAI,IAAA,mBAAW,EAAC,iBAAiB,CAAC;QAC5G,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,EAAE,iBAAiB,EAAE;QACxD,CAAC,CAAC,SAAS,CAAC;IAEhB,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,cAAc;QAC7B,cAAc;KACf,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,iBAAiB,qBAY5B;AAEW,QAAA,oBAAoB,GAA2C;IAC1E,CAAC,qBAAa,CAAC,EAAE,CAAC,EAAE,0BAAkB;IACtC,CAAC,qBAAa,CAAC,SAAS,CAAC,EAAE,0BAAkB;IAC7C,CAAC,qBAAa,CAAC,UAAU,CAAC,EAAE,0BAAkB;IAC9C,CAAC,qBAAa,CAAC,WAAW,CAAC,EAAE,yBAAiB;CAC/C,CAAC"}

package/dist/operations/numeric/sanitizers.js

@@ -23,10 +23,10 @@ const sanitizeNumericRange = (value) => {
 exports.sanitizeNumericRange = sanitizeNumericRange;
 exports.NumericSanitizersMapper = {
     [types_1.OperationEnum.Equal]: exports.sanitizeSingleNumber,
-    [types_1.OperationEnum.GreaterThan]: exports.sanitizeNumericRange,
+    [types_1.OperationEnum.GreaterThan]: exports.sanitizeSingleNumber,
     [types_1.OperationEnum.GreaterThanEqual]: exports.sanitizeSingleNumber,
     [types_1.OperationEnum.LesserThan]: exports.sanitizeSingleNumber,
-    [types_1.OperationEnum.LesserThanEqual]: exports.sanitizeNumericRange,
+    [types_1.OperationEnum.LesserThanEqual]: exports.sanitizeSingleNumber,
     [types_1.OperationEnum.BetweenNumeric]: exports.sanitizeNumericRange,
 };
 //# sourceMappingURL=sanitizers.js.map

package/docs/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.0.0-alpha.15](https://github.com/frontegg/entitlements-javascript-commons/compare/v-1.0.0-alpha.14...v-1.0.0-alpha.15) (2023-10-25)
+
+
+### Bug Fixes
+
+* **date:** fix incorrect sanitizers mapping ([#25](https://github.com/frontegg/entitlements-javascript-commons/issues/25)) ([da08f16](https://github.com/frontegg/entitlements-javascript-commons/commit/da08f1628753b1794422c83327670ae09242ec11))
+
+# [1.0.0-alpha.14](https://github.com/frontegg/entitlements-javascript-commons/compare/v-1.0.0-alpha.13...v-1.0.0-alpha.14) (2023-10-24)
+
+
+### Bug Fixes
+
+* **sanitizers:** fix numeric and date sanitizers ([#24](https://github.com/frontegg/entitlements-javascript-commons/issues/24)) ([8f5717a](https://github.com/frontegg/entitlements-javascript-commons/commit/8f5717acdcc0a1eccae84b272c7a02e315131a01))
+
 # [1.0.0-alpha.13](https://github.com/frontegg/entitlements-javascript-commons/compare/v-1.0.0-alpha.12...v-1.0.0-alpha.13) (2023-10-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontegg/entitlements-javascript-commons",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.15",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/operations/date/sanitizers.ts

@@ -1,8 +1,18 @@
 import { OperationEnum, Sanitizer, SanitizersMapper } from '../types';
 import { BetweenDateOperationPayload, DateOperationPayload, SingleDateOperationPayload } from './types';
 
+type RawDateValue = Date | string | number;
+
+export const sanitizeDateValue = (value: Date | string | number): Date => {
+  return new Date(value);
+};
+
+export const isValidDate = (value: unknown): boolean => value instanceof Date && !isNaN(value as unknown as number);
+
 export const sanitizeSingleDate: Sanitizer<SingleDateOperationPayload> = (value) => {
-  const sanitizedValue = value.date ? { date: value.date as Date } : undefined;
+  const sanitizedDateValue = value.date ? sanitizeDateValue(value.date as RawDateValue) : undefined;
+  const sanitizedValue =
+    sanitizedDateValue && isValidDate(sanitizedDateValue) ? { date: sanitizedDateValue } : undefined;
 
   return {
     isSanitized: !!sanitizedValue,
@@ -11,7 +21,12 @@ export const sanitizeSingleDate: Sanitizer<SingleDateOperationPayload> = (value)
 };
 
 export const sanitizeDateRange: Sanitizer<BetweenDateOperationPayload> = (value) => {
-  const sanitizedValue = value.start && value.end ? { start: value.start as Date, end: value.end as Date } : undefined;
+  const sanitizedStartValue = value.start ? sanitizeDateValue(value.start as RawDateValue) : undefined;
+  const sanitizedEndValue = value.end ? sanitizeDateValue(value.end as RawDateValue) : undefined;
+  const sanitizedValue =
+    sanitizedStartValue && sanitizedEndValue && isValidDate(sanitizedStartValue) && isValidDate(sanitizedEndValue)
+      ? { start: sanitizedStartValue, end: sanitizedEndValue }
+      : undefined;
 
   return {
     isSanitized: !!sanitizedValue,
@@ -21,7 +36,7 @@ export const sanitizeDateRange: Sanitizer<BetweenDateOperationPayload> = (value)
 
 export const DateSanitizersMapper: SanitizersMapper<DateOperationPayload> = {
   [OperationEnum.On]: sanitizeSingleDate,
-  [OperationEnum.OnOrAfter]: sanitizeDateRange,
+  [OperationEnum.OnOrAfter]: sanitizeSingleDate,
   [OperationEnum.OnOrBefore]: sanitizeSingleDate,
-  [OperationEnum.BetweenDate]: sanitizeSingleDate,
+  [OperationEnum.BetweenDate]: sanitizeDateRange,
 };

package/src/operations/date/tests/sanitizers.spec.ts

@@ -1,7 +1,24 @@
 import { fc, test } from '@fast-check/jest';
-import { sanitizeDateRange, sanitizeSingleDate } from '../sanitizers';
+import { isValidDate, sanitizeDateRange, sanitizeDateValue, sanitizeSingleDate } from '../sanitizers';
 
 describe('Date sanitizers', () => {
+  it.each([['2021-01-01'], ['2023-10-23T12:09:17.502Z'], [123432443], [new Date()]])(
+    'should return sanitized date when value is a string',
+    (value) => {
+      const sanitizationResult = sanitizeDateValue(value);
+
+      expect(sanitizationResult).toBeDefined();
+      expect(sanitizationResult).toEqual(new Date(value));
+    },
+  );
+
+  it.each([['not a date'], [], {}, [undefined]])('should return invalid date when value is not a date', (value) => {
+    const sanitizationResult = sanitizeDateValue(value as any);
+
+    expect(sanitizationResult).toBeDefined();
+    expect(isValidDate(sanitizationResult)).toBe(false);
+  });
+
   test.prop([fc.record({ date: fc.date() })], { verbose: true })(
     'should return sanitized when date value exists',
     (value) => {

package/src/operations/numeric/sanitizers.ts

@@ -26,9 +26,9 @@ export const sanitizeNumericRange: Sanitizer<BetweenNumericOperationPayload> = (
 
 export const NumericSanitizersMapper: SanitizersMapper<NumericOperationPayload> = {
   [OperationEnum.Equal]: sanitizeSingleNumber,
-  [OperationEnum.GreaterThan]: sanitizeNumericRange,
+  [OperationEnum.GreaterThan]: sanitizeSingleNumber,
   [OperationEnum.GreaterThanEqual]: sanitizeSingleNumber,
   [OperationEnum.LesserThan]: sanitizeSingleNumber,
-  [OperationEnum.LesserThanEqual]: sanitizeNumericRange,
+  [OperationEnum.LesserThanEqual]: sanitizeSingleNumber,
   [OperationEnum.BetweenNumeric]: sanitizeNumericRange,
 };