@pksep/zod-shared 0.0.531 → 0.0.533

package/dist/shipments/dto/shipments-paginate.dto.js

@@ -16,5 +16,7 @@ exports.ShipmentsPaginateSchema = zod_1.z.object({
     ]),
     companyId: zod_1.z.number().int().nullish(),
     searchStr: zod_1.z.string().optional(),
-    attributes: zod_1.z.array(zod_1.z.string()).optional()
+    attributes: zod_1.z.array(zod_1.z.string()).optional(),
+    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
+    sortDesc: zod_1.z.boolean().optional().default(false)
 });

package/dist/shipments/index.d.ts

@@ -20,3 +20,4 @@ export * from './interface/interface';
 export * from './dto/entity-filtering-by-shipment.dto';
 export * from './schemas/shipments-sh-complit.schema';
 export * from './dto/sh-complit-update.dto';
+export * from './dto/set-warehouse-readiness-date.dto';

package/dist/shipments/index.js

@@ -36,3 +36,4 @@ __exportStar(require("./interface/interface"), exports);
 __exportStar(require("./dto/entity-filtering-by-shipment.dto"), exports);
 __exportStar(require("./schemas/shipments-sh-complit.schema"), exports);
 __exportStar(require("./dto/sh-complit-update.dto"), exports);
+__exportStar(require("./dto/set-warehouse-readiness-date.dto"), exports);

package/dist/shipments/schemas/shipment-list-item.schema.d.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 export declare const ShipmentListItem: z.ZodObject<{
     date_shipments: z.ZodUnion<[z.ZodString, z.ZodDate]>;
+    warehouse_readiness_date: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodString, z.ZodDate]>>>;
     id: z.ZodNumber;
     number_order: z.ZodString;
     product: z.ZodOptional<z.ZodObject<{
@@ -117,6 +118,7 @@ export declare const ShipmentListItem: z.ZodObject<{
             shipmentsId: number;
         };
     }[] | undefined;
+    warehouse_readiness_date?: string | Date | null | undefined;
     detals?: {
         id: number;
         ShipmentsDetal: {
@@ -149,6 +151,7 @@ export declare const ShipmentListItem: z.ZodObject<{
             shipmentsId: number;
         };
     }[] | undefined;
+    warehouse_readiness_date?: string | Date | null | undefined;
     detals?: {
         id: number;
         ShipmentsDetal: {

package/dist/shipments/schemas/shipment-list-item.schema.js

@@ -6,6 +6,10 @@ const shipments_detal_schema_1 = require("./shipments-detal.schema");
 const shipments_cbed_schema_1 = require("./shipments-cbed.schema");
 exports.ShipmentListItem = zod_1.z.object({
     date_shipments: zod_1.z.union([zod_1.z.string(), zod_1.z.date()]),
+    warehouse_readiness_date: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date()])
+        .nullable()
+        .optional(),
     id: zod_1.z.number().int(),
     number_order: zod_1.z.string(),
     product: zod_1.z

package/dist/shipments/schemas/shipments.schema.d.ts

@@ -16,6 +16,7 @@ export declare const ShipmentsSchema: z.ZodObject<{
     ban: z.ZodDefault<z.ZodBoolean>;
     date_order: z.ZodDate;
     date_shipments: z.ZodDate;
+    warehouse_readiness_date: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
     number_order: z.ZodString;
     kol: z.ZodNumber;
     bron: z.ZodDefault<z.ZodBoolean>;
@@ -92,6 +93,7 @@ export declare const ShipmentsSchema: z.ZodObject<{
         purchasesId?: number | undefined;
     } | undefined;
     company_id?: number | undefined;
+    warehouse_readiness_date?: Date | null | undefined;
     parent_id?: number | null | undefined;
 }, {
     description: string;
@@ -120,6 +122,7 @@ export declare const ShipmentsSchema: z.ZodObject<{
         purchasesId?: number | undefined;
     } | undefined;
     company_id?: number | undefined;
+    warehouse_readiness_date?: Date | null | undefined;
     bron?: boolean | undefined;
     is_custom_product?: boolean | undefined;
     parent_id?: number | null | undefined;

package/dist/shipments/schemas/shipments.schema.js

@@ -9,6 +9,7 @@ exports.ShipmentsSchema = zod_1.z.object({
     ban: zod_1.z.boolean().default(false),
     date_order: zod_1.z.date(),
     date_shipments: zod_1.z.date(),
+    warehouse_readiness_date: zod_1.z.coerce.date().nullable().optional(),
     number_order: zod_1.z.string(),
     kol: zod_1.z.number().int().nonnegative(),
     bron: zod_1.z.boolean().default(false),

package/dist/specification/schema/attributes.schema.d.ts

@@ -914,6 +914,7 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
             ban: z.ZodDefault<z.ZodBoolean>;
             date_order: z.ZodDate;
             date_shipments: z.ZodDate;
+            warehouse_readiness_date: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
             number_order: z.ZodString;
             kol: z.ZodNumber;
             bron: z.ZodDefault<z.ZodBoolean>;
@@ -990,6 +991,7 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
                 purchasesId?: number | undefined;
             } | undefined;
             company_id?: number | undefined;
+            warehouse_readiness_date?: Date | null | undefined;
             parent_id?: number | null | undefined;
         }, {
             description: string;
@@ -1018,6 +1020,7 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
                 purchasesId?: number | undefined;
             } | undefined;
             company_id?: number | undefined;
+            warehouse_readiness_date?: Date | null | undefined;
             bron?: boolean | undefined;
             is_custom_product?: boolean | undefined;
             parent_id?: number | null | undefined;
@@ -1120,6 +1123,7 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
                 purchasesId?: number | undefined;
             } | undefined;
             company_id?: number | undefined;
+            warehouse_readiness_date?: Date | null | undefined;
             parent_id?: number | null | undefined;
         }[] | undefined;
         calculate_needs_time?: Date | null | undefined;
@@ -1407,6 +1411,7 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
                 purchasesId?: number | undefined;
             } | undefined;
             company_id?: number | undefined;
+            warehouse_readiness_date?: Date | null | undefined;
             bron?: boolean | undefined;
             is_custom_product?: boolean | undefined;
             parent_id?: number | null | undefined;
@@ -2504,6 +2509,7 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
                 purchasesId?: number | undefined;
             } | undefined;
             company_id?: number | undefined;
+            warehouse_readiness_date?: Date | null | undefined;
             parent_id?: number | null | undefined;
         }[] | undefined;
         calculate_needs_time?: Date | null | undefined;
@@ -2940,6 +2946,7 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
                 purchasesId?: number | undefined;
             } | undefined;
             company_id?: number | undefined;
+            warehouse_readiness_date?: Date | null | undefined;
             bron?: boolean | undefined;
             is_custom_product?: boolean | undefined;
             parent_id?: number | null | undefined;

package/dist/user/dto/update-user-table-config.dto.d.ts

@@ -5,17 +5,21 @@ export declare const UpdateUserTableConfigDtoSchema: z.ZodObject<{
     newConfigObject: z.ZodDefault<z.ZodArray<z.ZodObject<{
         columnName: z.ZodNativeEnum<typeof import("../..").tablesEnumConfig>;
         isShow: z.ZodDefault<z.ZodBoolean>;
+        position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        position: number;
         columnName: import("../..").tablesEnumConfig;
         isShow: boolean;
     }, {
         columnName: import("../..").tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }>, "many">>;
 }, "strip", z.ZodTypeAny, {
     userId: number;
     configKey: string;
     newConfigObject: {
+        position: number;
         columnName: import("../..").tablesEnumConfig;
         isShow: boolean;
     }[];
@@ -24,6 +28,7 @@ export declare const UpdateUserTableConfigDtoSchema: z.ZodObject<{
     configKey: string;
     newConfigObject?: {
         columnName: import("../..").tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }[] | undefined;
 }>;

package/dist/user/schemas/user-table-config.schema.d.ts

@@ -3,11 +3,14 @@ import { tablesEnumConfig } from '../../utils';
 export declare const UserTableConfigItemSchema: z.ZodObject<{
     columnName: z.ZodNativeEnum<typeof tablesEnumConfig>;
     isShow: z.ZodDefault<z.ZodBoolean>;
+    position: z.ZodDefault<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
+    position: number;
     columnName: tablesEnumConfig;
     isShow: boolean;
 }, {
     columnName: tablesEnumConfig;
+    position?: number | undefined;
     isShow?: boolean | undefined;
 }>;
 export type UserTableConfigItem = z.infer<typeof UserTableConfigItemSchema>;
@@ -17,115 +20,147 @@ export declare const UserTableConfigSchema: z.ZodObject<{
     metalworking: z.ZodArray<z.ZodObject<{
         columnName: z.ZodNativeEnum<typeof tablesEnumConfig>;
         isShow: z.ZodDefault<z.ZodBoolean>;
+        position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }, {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }>, "many">;
     metalworking_deficit_by_assemble: z.ZodArray<z.ZodObject<{
         columnName: z.ZodNativeEnum<typeof tablesEnumConfig>;
         isShow: z.ZodDefault<z.ZodBoolean>;
+        position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }, {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }>, "many">;
     online_board_production: z.ZodArray<z.ZodObject<{
         columnName: z.ZodNativeEnum<typeof tablesEnumConfig>;
         isShow: z.ZodDefault<z.ZodBoolean>;
+        position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }, {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }>, "many">;
     online_board: z.ZodArray<z.ZodObject<{
         columnName: z.ZodNativeEnum<typeof tablesEnumConfig>;
         isShow: z.ZodDefault<z.ZodBoolean>;
+        position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }, {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }>, "many">;
     assemble: z.ZodArray<z.ZodObject<{
         columnName: z.ZodNativeEnum<typeof tablesEnumConfig>;
         isShow: z.ZodDefault<z.ZodBoolean>;
+        position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }, {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }>, "many">;
     production_task_by_user: z.ZodArray<z.ZodObject<{
         columnName: z.ZodNativeEnum<typeof tablesEnumConfig>;
         isShow: z.ZodDefault<z.ZodBoolean>;
+        position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }, {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }>, "many">;
     production_task_by_equipment: z.ZodArray<z.ZodObject<{
         columnName: z.ZodNativeEnum<typeof tablesEnumConfig>;
         isShow: z.ZodDefault<z.ZodBoolean>;
+        position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }, {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }>, "many">;
     production_task_by_operation: z.ZodArray<z.ZodObject<{
         columnName: z.ZodNativeEnum<typeof tablesEnumConfig>;
         isShow: z.ZodDefault<z.ZodBoolean>;
+        position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }, {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
     id: number;
     assemble: {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }[];
     user_id: number;
     metalworking: {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }[];
     metalworking_deficit_by_assemble: {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }[];
     online_board_production: {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }[];
     online_board: {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }[];
     production_task_by_user: {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }[];
     production_task_by_equipment: {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }[];
     production_task_by_operation: {
+        position: number;
         columnName: tablesEnumConfig;
         isShow: boolean;
     }[];
@@ -133,35 +168,43 @@ export declare const UserTableConfigSchema: z.ZodObject<{
     id: number;
     assemble: {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }[];
     user_id: number;
     metalworking: {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }[];
     metalworking_deficit_by_assemble: {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }[];
     online_board_production: {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }[];
     online_board: {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }[];
     production_task_by_user: {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }[];
     production_task_by_equipment: {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }[];
     production_task_by_operation: {
         columnName: tablesEnumConfig;
+        position?: number | undefined;
         isShow?: boolean | undefined;
     }[];
 }>;

package/dist/user/schemas/user-table-config.schema.js

@@ -5,7 +5,8 @@ const zod_1 = require("zod");
 const utils_1 = require("../../utils");
 exports.UserTableConfigItemSchema = zod_1.z.object({
     columnName: zod_1.z.nativeEnum(utils_1.tablesEnumConfig),
-    isShow: zod_1.z.boolean().default(true)
+    isShow: zod_1.z.boolean().default(true),
+    position: zod_1.z.number().int().nonnegative().default(0)
 });
 exports.UserTableConfigSchema = zod_1.z.object({
     id: zod_1.z.number().int().positive(),

package/dist/user/schemas/user.schema.d.ts

@@ -32,6 +32,7 @@ export declare const UserSchema: z.ZodObject<{
     image: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     session_id: z.ZodNullable<z.ZodNumber>;
     last_online: z.ZodNullable<z.ZodNumber>;
+    createdAt: z.ZodOptional<z.ZodString>;
     rolesId: z.ZodNumber;
     role: z.ZodAny;
     documents: z.ZodArray<z.ZodObject<{
@@ -309,6 +310,7 @@ export declare const UserSchema: z.ZodObject<{
         action: import("../..").IActionText[];
         type_object: string;
         id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         responsible_id?: number | null | undefined;
         equipment_id?: number | null | undefined;
         user_id?: number | null | undefined;
@@ -338,13 +340,13 @@ export declare const UserSchema: z.ZodObject<{
         role_id?: number | null | undefined;
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
-        createdAt?: string | Date | undefined;
         revision_id?: number | null | undefined;
     }, {
         action: import("../..").IActionText[];
         type_object: string;
         ban?: boolean | undefined;
         id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         responsible_id?: number | null | undefined;
         equipment_id?: number | null | undefined;
         user_id?: number | null | undefined;
@@ -374,7 +376,6 @@ export declare const UserSchema: z.ZodObject<{
         role_id?: number | null | undefined;
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
-        createdAt?: string | Date | undefined;
         revision_id?: number | null | undefined;
     }>, "many">;
     responsibleForProduct: z.ZodArray<z.ZodObject<{
@@ -658,6 +659,7 @@ export declare const UserSchema: z.ZodObject<{
         action: import("../..").IActionText[];
         type_object: string;
         id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         responsible_id?: number | null | undefined;
         equipment_id?: number | null | undefined;
         user_id?: number | null | undefined;
@@ -687,7 +689,6 @@ export declare const UserSchema: z.ZodObject<{
         role_id?: number | null | undefined;
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
-        createdAt?: string | Date | undefined;
         revision_id?: number | null | undefined;
     }[];
     responsibleForProduct: {
@@ -751,6 +752,7 @@ export declare const UserSchema: z.ZodObject<{
     }[];
     role?: any;
     image?: string | null | undefined;
+    createdAt?: string | undefined;
     subdivision?: import("../enums").EnumSubdivision | undefined;
 }, {
     banReason: string | null;
@@ -852,6 +854,7 @@ export declare const UserSchema: z.ZodObject<{
         type_object: string;
         ban?: boolean | undefined;
         id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         responsible_id?: number | null | undefined;
         equipment_id?: number | null | undefined;
         user_id?: number | null | undefined;
@@ -881,7 +884,6 @@ export declare const UserSchema: z.ZodObject<{
         role_id?: number | null | undefined;
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
-        createdAt?: string | Date | undefined;
         revision_id?: number | null | undefined;
     }[];
     responsibleForProduct: {
@@ -954,6 +956,7 @@ export declare const UserSchema: z.ZodObject<{
         };
     }[] | undefined;
     image?: string | null | undefined;
+    createdAt?: string | undefined;
     subdivision?: import("../enums").EnumSubdivision | undefined;
 }>;
 export type ModelUser = z.infer<typeof UserSchema> & {

package/dist/user/schemas/user.schema.js

@@ -29,6 +29,7 @@ exports.UserSchema = zod_1.z.object({
     image: zod_1.z.string().nullish(),
     session_id: zod_1.z.number().int().nullable(),
     last_online: zod_1.z.number().int().nullable(),
+    createdAt: zod_1.z.string().optional(),
     rolesId: zod_1.z.number().int(),
     role: zod_1.z.any(),
     documents: zod_1.z.array(document_1.DocumentsSchema),

package/dist/utils/index.d.ts

@@ -27,3 +27,4 @@ export * from './default-value/default-value';
 export * from './tables-config/enum';
 export * from './tables-config/methods';
 export * from './tables-config/tables-array';
+export * from './sorting';

package/dist/utils/index.js

@@ -43,3 +43,4 @@ __exportStar(require("./default-value/default-value"), exports);
 __exportStar(require("./tables-config/enum"), exports);
 __exportStar(require("./tables-config/methods"), exports);
 __exportStar(require("./tables-config/tables-array"), exports);
+__exportStar(require("./sorting"), exports);

package/dist/utils/sorting.d.ts

@@ -0,0 +1,10 @@
+type SortValue = Date | number | string | boolean | null | undefined;
+type SortSelector<T> = (item: T) => SortValue;
+export declare enum ProductionPlanSortField {
+    calculateNeedsTime = "calculateNeedsTime",
+    calculatedCreateTime = "calculatedCreateTime",
+    warehouseReadinessDate = "warehouseReadinessDate",
+    orderedByProduction = "orderedByProduction"
+}
+export declare const sortByDirection: <T>(items: T[], selector: SortSelector<T>, desc?: boolean) => T[];
+export {};

package/dist/utils/sorting.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortByDirection = exports.ProductionPlanSortField = void 0;
+var ProductionPlanSortField;
+(function (ProductionPlanSortField) {
+    ProductionPlanSortField["calculateNeedsTime"] = "calculateNeedsTime";
+    ProductionPlanSortField["calculatedCreateTime"] = "calculatedCreateTime";
+    ProductionPlanSortField["warehouseReadinessDate"] = "warehouseReadinessDate";
+    ProductionPlanSortField["orderedByProduction"] = "orderedByProduction";
+})(ProductionPlanSortField || (exports.ProductionPlanSortField = ProductionPlanSortField = {}));
+const normalizeSortValue = (value) => {
+    if (value instanceof Date)
+        return value.getTime();
+    if (typeof value === 'string') {
+        const dateTime = Date.parse(value);
+        return Number.isNaN(dateTime) ? value.toLocaleLowerCase() : dateTime;
+    }
+    return value;
+};
+const sortByDirection = (items, selector, desc = false) => {
+    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;
+        }
+        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;

package/dist/utils/tables-config/methods.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCorrectColumnConfig = exports.checkMissingColumns = exports.generateDefaultConfigArray = void 0;
-const generateDefaultConfigArray = (configArray) => configArray.map(currentConfigitem => {
+/**
+ * Нормализует порядок колонок и всегда пересчитывает позицию колонки
+ * по фактической позиции элемента в массиве.
+ */
+const addPositionForColumns = (columns) => columns.map((currentColumn, index) => (Object.assign(Object.assign({}, currentColumn), { position: index })));
+const generateDefaultConfigArray = (configArray) => addPositionForColumns(configArray.map(currentConfigitem => {
     return {
         columnName: currentConfigitem,
         isShow: true
     };
-});
+}));
 exports.generateDefaultConfigArray = generateDefaultConfigArray;
 /**
  * Возвращает список колонок из `arrayToCheck`, которые отсутствуют в текущей конфигурации `columns`.
@@ -20,16 +25,28 @@ const checkMissingColumns = (columns, arrayToCheck) => {
 };
 exports.checkMissingColumns = checkMissingColumns;
 const createCorrectColumnConfig = (columns, arrayToCheck) => {
-    const columnMap = new Map();
-    columns.forEach(currentColumn => {
-        columnMap.set(currentColumn.columnName, currentColumn);
+    const availableColumns = new Set(arrayToCheck);
+    const uniqueColumns = new Map();
+    columns
+        .filter(currentColumn => availableColumns.has(currentColumn.columnName))
+        .sort((leftColumn, rightColumn) => leftColumn.position - rightColumn.position)
+        .forEach(currentColumn => {
+        uniqueColumns.set(currentColumn.columnName, currentColumn);
+    });
+    const normalizedColumns = Array.from(uniqueColumns.values()).map(currentColumn => {
+        return {
+            columnName: currentColumn.columnName,
+            isShow: currentColumn.isShow
+        };
     });
-    const newColumnArray = arrayToCheck.map(currentItem => {
-        const currentItemFromMap = columnMap.get(currentItem);
-        return currentItemFromMap
-            ? currentItemFromMap
-            : { columnName: currentItem, isShow: true };
+    arrayToCheck.forEach(currentItem => {
+        if (uniqueColumns.has(currentItem))
+            return;
+        normalizedColumns.push({
+            columnName: currentItem,
+            isShow: true
+        });
     });
-    return newColumnArray;
+    return addPositionForColumns(normalizedColumns);
 };
 exports.createCorrectColumnConfig = createCorrectColumnConfig;

package/package.json

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