@dative-gpi/foundation-shared-domain 0.0.100 → 0.0.102

package/index.ts

@@ -1 +1,2 @@
-export * from "./models";
+export * from "./models";
+export * from "./tools";

package/models/authTokens/authTokenInfos.ts

@@ -1,20 +1,20 @@
-import { DatesTools } from "../../tools";
+import { utcToEpoch } from "../../tools";
 
 export class AuthTokenInfos {
-    id: string | null;
-    token: string;
-    dateMax: number | null;
+  id: string | null;
+  token: string;
+  dateMax: number | null;
 
-    constructor(params: AuthTokenInfosDTO) {
-        this.id = params.id;
-        this.token = params.token;
-        this.dateMax = params.dateMax ?
-            DatesTools.utcToEpoch(params.dateMax) : null;
-    }
+  constructor(params: AuthTokenInfosDTO) {
+    this.id = params.id;
+    this.token = params.token;
+    this.dateMax = params.dateMax ?
+      utcToEpoch(params.dateMax) : null;
+  }
 }
 
 export interface AuthTokenInfosDTO {
-    id: string | null;
-    token: string;
-    dateMax: string | null;
+  id: string | null;
+  token: string;
+  dateMax: string | null;
 }

package/models/enums/dateEnums.ts

@@ -0,0 +1,43 @@
+export enum DateSetting {
+  None               = 0,
+  PastHours          = 1,
+  PastDays           = 2,
+  PastWeeks          = 3,
+  PastMonths         = 4,
+  PastYears          = 5,
+  CurrentHour        = 6,
+  CurrentDay         = 7,
+  CurrentWeek        = 8,
+  CurrentMonth       = 9,
+  CurrentYear        = 10,
+  Expression         = 11,
+  Pick               = 12,
+  LastDay            = 13,
+  LastWeek           = 14,
+  LastMonth          = 15,
+  LastYear           = 16,
+  SinceLastDay       = 17,
+  SinceLastWeek      = 18,
+  SinceLastMonth     = 19,
+  SinceLastYear      = 20,
+  LastPeriod         = 21,
+  MinutesBeforeAfter = 22,
+  HoursBeforeAfter   = 23,
+  DaysBeforeAfter    = 24,
+  WeeksBeforeAfter   = 25,
+  MinutesBefore      = 26,
+  HoursBefore        = 27,
+  DaysBefore         = 28,
+  WeeksBefore        = 29
+}
+
+export enum Days {
+  Monday    = 0,
+  Tuesday   = 1,
+  Wednesday = 2,
+  Thursday  = 3,
+  Friday    = 4,
+  Saturday  = 5,
+  Sunday    = 6,
+  AllDays   = 7
+}

package/models/enums/deviceEnums.ts

@@ -1,7 +1,7 @@
 export enum ConnectivityStatus {
-    None = 0,
-    Connected = 1,
-    PartiallyConnected = 2,
-    AlmostOffline = 3,
-    Offline = 4
+  None               = 0,
+  Connected          = 1,
+  PartiallyConnected = 2,
+  AlmostOffline      = 3,
+  Offline            = 4
 }

package/models/enums/index.ts

@@ -1,4 +1,4 @@
 export * from "./alertEnums";
 export * from "./dashboardEnums";
-export * from "./deviceEnums";
-export * from "./sharedEnums";
+export * from "./dateEnums";
+export * from "./deviceEnums";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-domain",
   "sideEffects": false,
-  "version": "0.0.100",
+  "version": "0.0.102",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,5 @@
   "dependencies": {
     "date-fns": "^3.6.0"
   },
-  "gitHead": "f1231dafad8eae9bf349af5f0e238dd88d20f2e2"
+  "gitHead": "d2534b5fa79d557769bcdfd5da4b8dffa0f42c3e"
 }

package/tools/datesTools.ts

@@ -1,15 +1,79 @@
 import { parse } from "date-fns";
 
+const BASE = ["now"];
+const WIDGET = ["from", "to"];
+const ALERT = ["alert", "alertstart", "alertend"];
+
 const removeArtifacts = (date: string): string => {
-    return date.substring(0, 19) + "Z";
+  return date.substring(0, 19) + "Z";
 };
 
-const isoTimeFormat = (timeZone: boolean = false): string => {
+const fromExpression = (expression: string, variant: 'default' | 'before-after'): boolean => {
+  if (
+    /^\d{2}\/\d{2}\/\d{4} \d{2}:\d{2}(:\d{2})?$/g.test(expression) ||
+    /^\d{4}-\d{2}-\d{2}[ |T]\d{2}:\d{2}(:\d{2})?$/g.test(expression)
+  ) {
+    if (!isNaN(Date.parse(expression))) {
+      return true;
+    }
+  }
+  let variables = BASE.slice();
+  switch (variant) {
+    case "default": {
+      variables = variables.concat(WIDGET);
+      break;
+    }
+    case "before-after": {
+      variables = variables.concat(ALERT);
+      break;
+    }
+  }
+  variables = variables.sort((a: string, b: string) => b.length - a.length);
+  for (let i = 0; i < variables.length; i++) {
+    if (expression.startsWith(variables[i])) {
+      expression = expression.substring(variables[i].length).replaceAll(" ", "");
+    }
+  }
+  let match = /^(?:(?:([-+])(\d*))?(\w+))?(?:\/(\w))?/g.exec(expression);
+  while (match != null && !(match[0] == null || (match[0].match(/^ *$/) !== null))) {
+    let doSomething = false;
+    if (!(match[1] == null || (match[1].match(/^ *$/) !== null)) && !(match[3] == null || (match[3].match(/^ *$/) !== null))) {
+      if (!["-", "+"].includes(match[1])) {
+        return false
+      }
+      if (!variables.includes(match[3])) {
+        if (isNaN(parseInt(match[2])) || !["s", "m", "h", "d", "w", "M", "y"].includes(match[3])) {
+          return false;
+        }
+      }
+      doSomething = true;
+    }
+    if (!(match[4] == null || (match[4].match(/^ *$/) !== null))) {
+      if (!["s", "m", "h", "d", "w", "M", "y"].includes(match[4])) {
+        return false;
+      }
+      doSomething = true;
+    }
+    if (!doSomething) {
+      return false;
+    }
+    expression = expression.substring(match[0].length);
+    match = /(?:(?:([-+])(\d*))?(\w+))?(?:\/(\w))?/g.exec(expression);
+  }
+  if (expression.length) {
+    return false;
+  }
+  return true;
+}
+
+export const isoTimeFormat = (timeZone: boolean = false): string => {
     return `yyyy-MM-dd'T'HH:mm:ss${timeZone ? "X" : ""}`;
 };
 
-export const DatesTools =  {
-    utcToEpoch: (value: string): number => {
-        return parse(removeArtifacts(value), isoTimeFormat(true), new Date()).getTime();
-    }
+export const utcToEpoch = (value: string): number => {
+  return parse(removeArtifacts(value), isoTimeFormat(true), new Date()).getTime();
+};
+
+export const validateExpression = (expression: string, variant: "default" | "before-after"): boolean => {
+  return (fromExpression(expression!, variant));
 };

package/models/enums/sharedEnums.ts

@@ -1,10 +0,0 @@
-export enum Days {
-    Monday = 0,
-    Tuesday = 1,
-    Wednesday = 2,
-    Thursday = 3,
-    Friday = 4,
-    Saturday = 5,
-    Sunday = 6,
-    AllDays = 7
-}