@startinblox/components-ds4go 2.3.0 → 3.0.1

package/src/helpers/datas/sort.ts

@@ -1,10 +1,10 @@
 const getValueFromAnyKey = (obj: any, keys: string[]): any => {
   let value = obj;
-  for (let i = 0; i < keys.length; i++) {
-    if (value && keys[i] in value) {
-      value = value[keys[i]];
+  for (const key of keys) {
+    if (value && key in value) {
+      value = value[key];
     } else {
-      break;
+      return undefined;
     }
   }
   return value;
@@ -13,28 +13,55 @@ const getValueFromAnyKey = (obj: any, keys: string[]): any => {
 type Sort = (arr: any[], k: string | string[], order?: "asc" | "desc") => any[];
 
 const sort: Sort = (arr, k, order = "asc") => {
-  return arr.sort((a, b) => {
-    let aN = a;
-    let bN = b;
-    if (Array.isArray(k)) {
-      aN = getValueFromAnyKey(a, k);
-      bN = getValueFromAnyKey(b, k);
-    } else {
-      aN = a[k];
-      bN = b[k];
+  const keys = Array.isArray(k) ? k : [k];
+  const shouldReverse = order !== "asc";
+
+  const result = [...arr];
+
+  const getComparator = () => {
+    const sampleValue = getValueFromAnyKey(result[0], keys);
+
+    if (typeof sampleValue === "number") {
+      return (a: any, b: any) => {
+        const aN = getValueFromAnyKey(a, keys);
+        const bN = getValueFromAnyKey(b, keys);
+        if (aN == null) return bN == null ? 0 : 1;
+        if (bN == null) return -1;
+        return (aN as number) - (bN as number);
+      };
     }
-    let c = 0;
-    if (typeof aN === "number" && typeof bN === "number") {
-      c = aN - bN;
-    } else if (typeof aN === "string" && typeof bN === "string") {
-      c = aN.localeCompare(bN);
-    } else if (aN instanceof Date && bN instanceof Date) {
-      c = aN.getTime() - bN.getTime();
-    } else {
-      throw new TypeError(`Unsupported data type for key "${k}"`);
+
+    if (typeof sampleValue === "string") {
+      return (a: any, b: any) => {
+        const aN = getValueFromAnyKey(a, keys);
+        const bN = getValueFromAnyKey(b, keys);
+        if (aN == null) return bN == null ? 0 : 1;
+        if (bN == null) return -1;
+        return (aN as string).localeCompare(bN as string);
+      };
     }
-    return order === "asc" ? c : -c;
+
+    if (sampleValue instanceof Date) {
+      return (a: any, b: any) => {
+        const aN = getValueFromAnyKey(a, keys);
+        const bN = getValueFromAnyKey(b, keys);
+        if (aN == null) return bN == null ? 0 : 1;
+        if (bN == null) return -1;
+        return (aN as Date).getTime() - (bN as Date).getTime();
+      };
+    }
+
+    throw new TypeError(`Unsupported data type for key "${k}"`);
+  };
+
+  const comparator = getComparator();
+
+  result.sort((a, b) => {
+    const comparison = comparator(a, b);
+    return shouldReverse ? -comparison : comparison;
   });
+
+  return result;
 };
 
 export default sort;

package/src/helpers/index.ts

@@ -8,6 +8,7 @@ import setupComponentSubscriptions from "@helpers/components/setupComponentSubsc
 import setupOnSaveReset from "@helpers/components/setupOnSaveReset";
 import filterGenerator from "@helpers/datas/filterGenerator";
 import filterObjectByDateAfter from "@helpers/datas/filterObjectByDateAfter";
+import filterObjectByDateInterval from "@helpers/datas/filterObjectByDateInterval";
 import filterObjectById from "@helpers/datas/filterObjectById";
 import filterObjectByInterval from "@helpers/datas/filterObjectByInterval";
 import filterObjectByNamedValue from "@helpers/datas/filterObjectByNamedValue";
@@ -29,6 +30,7 @@ export {
   filterObjectByNamedValue,
   filterObjectByValue,
   filterObjectByType,
+  filterObjectByDateInterval,
   formatDate,
   ComponentObjectHandler,
   ComponentObjectsHandler,

package/src/helpers/ui/formatDate.ts

@@ -1,3 +1,15 @@
+const formatters = new Map<string, Intl.DateTimeFormat>();
+
+const getFormatter = (format: Intl.DateTimeFormatOptions): Intl.DateTimeFormat => {
+  const key = JSON.stringify(format);
+  let formatter = formatters.get(key);
+  if (!formatter) {
+    formatter = new Intl.DateTimeFormat(undefined, format);
+    formatters.set(key, formatter);
+  }
+  return formatter;
+};
+
 const formatDate = (
   originalDate: string | Date | undefined,
   format: Intl.DateTimeFormatOptions = {
@@ -9,7 +21,8 @@ const formatDate = (
   if (!originalDate) return "";
   const date =
     typeof originalDate === "string" ? new Date(originalDate) : originalDate;
-  const formattedDate = date.toLocaleString(undefined, format);
+  const formatter = getFormatter(format);
+  const formattedDate = formatter.format(date);
   if (typeof originalDate === "string" && formattedDate === "Invalid Date")
     return originalDate;
   return formattedDate;

package/src/helpers/utils/requestNavigation.ts

@@ -1,8 +1,11 @@
-const requestNavigation = (route: string, resource: string | boolean = false) => {
+const requestNavigation = (
+  route: string,
+  resource: string | boolean = false,
+) => {
   window.dispatchEvent(
     new CustomEvent("requestNavigation", {
       detail: {
-        route: route,
+        route,
         resource: typeof resource === "string" ? { "@id": resource } : resource,
       },
     }),

package/src/helpers/utils/uniq.ts

@@ -2,5 +2,5 @@
  * Generates a unique random string using the Math.random() method.
  */
 export default function uniq(): string {
-  return Math.random().toString(16).slice(2);
+  return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
 }

package/cypress/component/solid-boilerplate.cy.ts

@@ -1,9 +0,0 @@
-import { html } from "lit";
-
-describe("<solid-boilerplate>", () => {
-  it("should mount", () => {
-    cy.mount(html`<solid-boilerplate></solid-boilerplate>`);
-
-    cy.get("solid-boilerplate").should("exist");
-  });
-});