@pksep/zod-shared 0.0.533 → 0.0.535

package/dist/utils/sorting.d.ts

@@ -1,3 +1,4 @@
+import { z } from 'zod';
 type SortValue = Date | number | string | boolean | null | undefined;
 type SortSelector<T> = (item: T) => SortValue;
 export declare enum ProductionPlanSortField {
@@ -6,5 +7,19 @@ export declare enum ProductionPlanSortField {
     warehouseReadinessDate = "warehouseReadinessDate",
     orderedByProduction = "orderedByProduction"
 }
-export declare const sortByDirection: <T>(items: T[], selector: SortSelector<T>, desc?: boolean) => T[];
+export type ProductionPlanSortRule = {
+    sortField?: ProductionPlanSortField | null;
+    sortDesc?: boolean;
+};
+export declare const ProductionPlanSortRuleSchema: z.ZodObject<{
+    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
+    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+}, "strip", z.ZodTypeAny, {
+    sortDesc: boolean;
+    sortField?: ProductionPlanSortField | null | undefined;
+}, {
+    sortField?: ProductionPlanSortField | null | undefined;
+    sortDesc?: boolean | undefined;
+}>;
+export declare const sortByRules: <T>(items: T[], rules: ProductionPlanSortRule[] | null | undefined, selectors: Partial<Record<ProductionPlanSortField, SortSelector<T>>>) => T[];
 export {};

package/dist/utils/sorting.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByDirection = exports.ProductionPlanSortField = void 0;
+exports.sortByRules = exports.ProductionPlanSortRuleSchema = exports.ProductionPlanSortField = void 0;
+const zod_1 = require("zod");
+const NULL_STRING_VALUES = new Set(['', 'null', 'undefined', 'invalid date']);
 var ProductionPlanSortField;
 (function (ProductionPlanSortField) {
     ProductionPlanSortField["calculateNeedsTime"] = "calculateNeedsTime";
@@ -8,6 +10,10 @@ var ProductionPlanSortField;
     ProductionPlanSortField["warehouseReadinessDate"] = "warehouseReadinessDate";
     ProductionPlanSortField["orderedByProduction"] = "orderedByProduction";
 })(ProductionPlanSortField || (exports.ProductionPlanSortField = ProductionPlanSortField = {}));
+exports.ProductionPlanSortRuleSchema = zod_1.z.object({
+    sortField: zod_1.z.nativeEnum(ProductionPlanSortField).nullable().optional(),
+    sortDesc: zod_1.z.boolean().optional().default(false)
+});
 const normalizeSortValue = (value) => {
     if (value instanceof Date)
         return value.getTime();
@@ -17,24 +23,45 @@ const normalizeSortValue = (value) => {
     }
     return value;
 };
-const sortByDirection = (items, selector, desc = false) => {
+const isNullSortValue = (value) => {
+    if (value === null || value === undefined)
+        return true;
+    if (value instanceof Date)
+        return Number.isNaN(value.getTime());
+    if (typeof value === 'string') {
+        return NULL_STRING_VALUES.has(value.trim().toLocaleLowerCase());
+    }
+    return false;
+};
+const compareValues = (firstValue, secondValue, desc = false) => {
+    const isFirstNull = isNullSortValue(firstValue);
+    const isSecondNull = isNullSortValue(secondValue);
+    if (isFirstNull || isSecondNull) {
+        if (isFirstNull && isSecondNull)
+            return 0;
+        return isFirstNull ? (desc ? 1 : -1) : desc ? -1 : 1;
+    }
+    const normalizedFirstValue = normalizeSortValue(firstValue);
+    const normalizedSecondValue = normalizeSortValue(secondValue);
+    if (normalizedFirstValue < normalizedSecondValue)
+        return desc ? 1 : -1;
+    if (normalizedFirstValue > normalizedSecondValue)
+        return desc ? -1 : 1;
+    return 0;
+};
+const sortByRules = (items, rules, selectors) => {
+    const activeRules = (rules !== null && rules !== void 0 ? rules : []).filter(rule => rule.sortField && selectors[rule.sortField]);
+    if (!activeRules.length)
+        return items;
     return [...items].sort((firstItem, secondItem) => {
-        const firstValue = selector(firstItem);
-        const secondValue = selector(secondItem);
-        const isFirstNull = firstValue === null || firstValue === undefined;
-        const isSecondNull = secondValue === null || secondValue === undefined;
-        if (isFirstNull || isSecondNull) {
-            if (isFirstNull && isSecondNull)
-                return 0;
-            return isFirstNull ? (desc ? -1 : 1) : desc ? 1 : -1;
+        var _a;
+        for (const rule of activeRules) {
+            const selector = selectors[rule.sortField];
+            const result = compareValues(selector(firstItem), selector(secondItem), (_a = rule.sortDesc) !== null && _a !== void 0 ? _a : false);
+            if (result !== 0)
+                return result;
         }
-        const normalizedFirstValue = normalizeSortValue(firstValue);
-        const normalizedSecondValue = normalizeSortValue(secondValue);
-        if (normalizedFirstValue < normalizedSecondValue)
-            return desc ? 1 : -1;
-        if (normalizedFirstValue > normalizedSecondValue)
-            return desc ? -1 : 1;
         return 0;
     });
 };
-exports.sortByDirection = sortByDirection;
+exports.sortByRules = sortByRules;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pksep/zod-shared",
-  "version": "0.0.533",
+  "version": "0.0.535",
   "description": "Zod package for erp project. Contains dto, interfaces, schems, types, enum",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",