@pksep/zod-shared 0.0.560 → 0.0.562

package/dist/detal/dto/update-detal.dto.d.ts

@@ -1,48 +1,372 @@
 import { z } from 'zod';
-import { DetalWorkpieceCharacteristics, EntityCommonSpecificationArray } from '../../utils';
-import { detalParametrsField } from '../types/detal';
+import { EntityCommonSpecificationArray } from '../../utils';
+export declare const DetalParametrsFieldZod: z.ZodObject<{
+    preTime: z.ZodObject<{
+        ez: z.ZodString;
+        znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+    }, "strip", z.ZodTypeAny, {
+        znach: string | number;
+        ez: string;
+    }, {
+        znach: string | number;
+        ez: string;
+    }>;
+    helperTime: z.ZodObject<{
+        ez: z.ZodString;
+        znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+    }, "strip", z.ZodTypeAny, {
+        znach: string | number;
+        ez: string;
+    }, {
+        znach: string | number;
+        ez: string;
+    }>;
+    mainTime: z.ZodObject<{
+        ez: z.ZodString;
+        znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+    }, "strip", z.ZodTypeAny, {
+        znach: string | number;
+        ez: string;
+    }, {
+        znach: string | number;
+        ez: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    preTime: {
+        znach: string | number;
+        ez: string;
+    };
+    helperTime: {
+        znach: string | number;
+        ez: string;
+    };
+    mainTime: {
+        znach: string | number;
+        ez: string;
+    };
+}, {
+    preTime: {
+        znach: string | number;
+        ez: string;
+    };
+    helperTime: {
+        znach: string | number;
+        ez: string;
+    };
+    mainTime: {
+        znach: string | number;
+        ez: string;
+    };
+}>;
+export declare const DetalCharacteristicFieldZod: z.ZodArray<z.ZodObject<{
+    name: z.ZodString;
+    ez: z.ZodString;
+    znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+}, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+    name: z.ZodString;
+    ez: z.ZodString;
+    znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+}, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+    name: z.ZodString;
+    ez: z.ZodString;
+    znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+}, z.ZodTypeAny, "passthrough">>, "many">;
+export declare const DetalWorkpieceCharacteristicsZod: z.ZodObject<{
+    dxl: z.ZodObject<{
+        d: z.ZodNumber;
+        l: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        d: number;
+        l: number;
+    }, {
+        d: number;
+        l: number;
+    }>;
+    length: z.ZodNumber;
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+    wallThickness: z.ZodNumber;
+    outsideDiameter: z.ZodNumber;
+    thickness: z.ZodNumber;
+    areaCrossSectional: z.ZodNumber;
+    acrossFlats: z.ZodNumber;
+    massPerMeter: z.ZodNumber;
+    density: z.ZodNumber;
+    mass: z.ZodNumber;
+    trash: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    length: number;
+    width: number;
+    height: number;
+    density: number;
+    wallThickness: number;
+    outsideDiameter: number;
+    thickness: number;
+    areaCrossSectional: number;
+    acrossFlats: number;
+    massPerMeter: number;
+    dxl: {
+        d: number;
+        l: number;
+    };
+    mass: number;
+    trash: number;
+}, {
+    length: number;
+    width: number;
+    height: number;
+    density: number;
+    wallThickness: number;
+    outsideDiameter: number;
+    thickness: number;
+    areaCrossSectional: number;
+    acrossFlats: number;
+    massPerMeter: number;
+    dxl: {
+        d: number;
+        l: number;
+    };
+    mass: number;
+    trash: number;
+}>;
 export declare const UpCreateDetalDtoZod: z.ZodObject<{
-    id: z.ZodEffects<z.ZodNullable<z.ZodOptional<z.ZodNumber>>, number | null | undefined, unknown>;
+    id: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodNumber>>, number | null | undefined, unknown>;
     name: z.ZodString;
     designation: z.ZodString;
     responsible: z.ZodString;
-    description: z.ZodString;
-    parametrs: z.ZodEffects<z.ZodType<detalParametrsField, z.ZodTypeDef, detalParametrsField>, detalParametrsField, unknown>;
-    characteristic: z.ZodAny;
+    description: z.ZodDefault<z.ZodString>;
+    parametrs: z.ZodEffects<z.ZodObject<{
+        preTime: z.ZodObject<{
+            ez: z.ZodString;
+            znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+        }, "strip", z.ZodTypeAny, {
+            znach: string | number;
+            ez: string;
+        }, {
+            znach: string | number;
+            ez: string;
+        }>;
+        helperTime: z.ZodObject<{
+            ez: z.ZodString;
+            znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+        }, "strip", z.ZodTypeAny, {
+            znach: string | number;
+            ez: string;
+        }, {
+            znach: string | number;
+            ez: string;
+        }>;
+        mainTime: z.ZodObject<{
+            ez: z.ZodString;
+            znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+        }, "strip", z.ZodTypeAny, {
+            znach: string | number;
+            ez: string;
+        }, {
+            znach: string | number;
+            ez: string;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        preTime: {
+            znach: string | number;
+            ez: string;
+        };
+        helperTime: {
+            znach: string | number;
+            ez: string;
+        };
+        mainTime: {
+            znach: string | number;
+            ez: string;
+        };
+    }, {
+        preTime: {
+            znach: string | number;
+            ez: string;
+        };
+        helperTime: {
+            znach: string | number;
+            ez: string;
+        };
+        mainTime: {
+            znach: string | number;
+            ez: string;
+        };
+    }>, {
+        preTime: {
+            znach: string | number;
+            ez: string;
+        };
+        helperTime: {
+            znach: string | number;
+            ez: string;
+        };
+        mainTime: {
+            znach: string | number;
+            ez: string;
+        };
+    }, unknown>;
+    characteristic: z.ZodEffects<z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        ez: z.ZodString;
+        znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+    }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+        name: z.ZodString;
+        ez: z.ZodString;
+        znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+    }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+        name: z.ZodString;
+        ez: z.ZodString;
+        znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+    }, z.ZodTypeAny, "passthrough">>, "many">, z.objectOutputType<{
+        name: z.ZodString;
+        ez: z.ZodString;
+        znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+    }, z.ZodTypeAny, "passthrough">[], unknown>;
     mat_zag: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodNumber>>, number | null | undefined, unknown>;
     mat_zag_zam: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodNumber>>, number | null | undefined, unknown>;
     materialList: z.ZodEffects<z.ZodType<EntityCommonSpecificationArray, z.ZodTypeDef, EntityCommonSpecificationArray>, EntityCommonSpecificationArray, unknown>;
-    docs: z.ZodAny;
+    docs: z.ZodDefault<z.ZodNullable<z.ZodAny>>;
     techProcessID: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodNumber>>, number | null | undefined, unknown>;
-    fileBase: z.ZodOptional<z.ZodString>;
-    attention: z.ZodEffects<z.ZodBoolean, boolean, unknown>;
-    discontinued: z.ZodEffects<z.ZodBoolean, boolean, unknown>;
-    workpiece_characterization: z.ZodEffects<z.ZodType<DetalWorkpieceCharacteristics, z.ZodTypeDef, DetalWorkpieceCharacteristics>, DetalWorkpieceCharacteristics, unknown>;
+    deletedDocumentIds: z.ZodOptional<z.ZodString>;
+    fileBase: z.ZodDefault<z.ZodString>;
+    attention: z.ZodEffects<z.ZodDefault<z.ZodBoolean>, boolean, unknown>;
+    discontinued: z.ZodEffects<z.ZodDefault<z.ZodBoolean>, boolean, unknown>;
+    workpiece_characterization: z.ZodEffects<z.ZodObject<{
+        dxl: z.ZodObject<{
+            d: z.ZodNumber;
+            l: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            d: number;
+            l: number;
+        }, {
+            d: number;
+            l: number;
+        }>;
+        length: z.ZodNumber;
+        width: z.ZodNumber;
+        height: z.ZodNumber;
+        wallThickness: z.ZodNumber;
+        outsideDiameter: z.ZodNumber;
+        thickness: z.ZodNumber;
+        areaCrossSectional: z.ZodNumber;
+        acrossFlats: z.ZodNumber;
+        massPerMeter: z.ZodNumber;
+        density: z.ZodNumber;
+        mass: z.ZodNumber;
+        trash: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        length: number;
+        width: number;
+        height: number;
+        density: number;
+        wallThickness: number;
+        outsideDiameter: number;
+        thickness: number;
+        areaCrossSectional: number;
+        acrossFlats: number;
+        massPerMeter: number;
+        dxl: {
+            d: number;
+            l: number;
+        };
+        mass: number;
+        trash: number;
+    }, {
+        length: number;
+        width: number;
+        height: number;
+        density: number;
+        wallThickness: number;
+        outsideDiameter: number;
+        thickness: number;
+        areaCrossSectional: number;
+        acrossFlats: number;
+        massPerMeter: number;
+        dxl: {
+            d: number;
+            l: number;
+        };
+        mass: number;
+        trash: number;
+    }>, {
+        length: number;
+        width: number;
+        height: number;
+        density: number;
+        wallThickness: number;
+        outsideDiameter: number;
+        thickness: number;
+        areaCrossSectional: number;
+        acrossFlats: number;
+        massPerMeter: number;
+        dxl: {
+            d: number;
+            l: number;
+        };
+        mass: number;
+        trash: number;
+    }, unknown>;
 }, "strip", z.ZodTypeAny, {
     designation: string;
     description: string;
     name: string;
-    parametrs: detalParametrsField;
+    parametrs: {
+        preTime: {
+            znach: string | number;
+            ez: string;
+        };
+        helperTime: {
+            znach: string | number;
+            ez: string;
+        };
+        mainTime: {
+            znach: string | number;
+            ez: string;
+        };
+    };
+    characteristic: z.objectOutputType<{
+        name: z.ZodString;
+        ez: z.ZodString;
+        znach: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+    }, z.ZodTypeAny, "passthrough">[];
     materialList: EntityCommonSpecificationArray;
     attention: boolean;
     discontinued: boolean;
-    workpiece_characterization: DetalWorkpieceCharacteristics;
+    fileBase: string;
+    workpiece_characterization: {
+        length: number;
+        width: number;
+        height: number;
+        density: number;
+        wallThickness: number;
+        outsideDiameter: number;
+        thickness: number;
+        areaCrossSectional: number;
+        acrossFlats: number;
+        massPerMeter: number;
+        dxl: {
+            d: number;
+            l: number;
+        };
+        mass: number;
+        trash: number;
+    };
     responsible: string;
     id?: number | null | undefined;
-    characteristic?: any;
     docs?: any;
-    fileBase?: string | undefined;
     mat_zag?: number | null | undefined;
     mat_zag_zam?: number | null | undefined;
     techProcessID?: number | null | undefined;
+    deletedDocumentIds?: string | undefined;
 }, {
     designation: string;
-    description: string;
     name: string;
     responsible: string;
+    description?: string | undefined;
     id?: unknown;
     parametrs?: unknown;
-    characteristic?: any;
+    characteristic?: unknown;
     materialList?: unknown;
     attention?: unknown;
     discontinued?: unknown;
@@ -52,5 +376,6 @@ export declare const UpCreateDetalDtoZod: z.ZodObject<{
     mat_zag?: unknown;
     mat_zag_zam?: unknown;
     techProcessID?: unknown;
+    deletedDocumentIds?: string | undefined;
 }>;
 export type UpCreateDetalDtoType = z.infer<typeof UpCreateDetalDtoZod>;

package/dist/detal/dto/update-detal.dto.js

@@ -1,34 +1,95 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UpCreateDetalDtoZod = void 0;
+exports.UpCreateDetalDtoZod = exports.DetalWorkpieceCharacteristicsZod = exports.DetalCharacteristicFieldZod = exports.DetalParametrsFieldZod = void 0;
 const zod_1 = require("zod");
 const utils_1 = require("../../utils");
 const default_values_1 = require("../default-values/default-values");
-exports.UpCreateDetalDtoZod = zod_1.z.object({
-    id: zod_1.z.preprocess(val => typeof val === 'string' && parseInt(val, 10) ? parseInt(val, 10) : null, zod_1.z.number().optional().nullable()),
-    name: zod_1.z.string(),
-    designation: zod_1.z.string(),
-    responsible: zod_1.z.string(),
-    description: zod_1.z.string(),
-    parametrs: zod_1.z.preprocess(val => (0, utils_1.parseParamsOrBody)(val, default_values_1.defailtParametrsValue), zod_1.z.custom()),
-    characteristic: zod_1.z.any(),
-    mat_zag: zod_1.z.preprocess(val => typeof val === 'string' && parseInt(val, 10) ? parseInt(val, 10) : null, zod_1.z.number().nullable().optional()),
-    mat_zag_zam: zod_1.z.preprocess(val => typeof val === 'string' && parseInt(val, 10) ? parseInt(val, 10) : null, zod_1.z.number().nullable().optional()),
-    materialList: zod_1.z.preprocess(value => {
-        if (typeof value === 'string') {
-            return (0, utils_1.parseParamsOrBody)({ value }, null);
-        }
+const stringOrNumberSchema = zod_1.z.union([zod_1.z.string(), zod_1.z.number()]);
+/**
+ * Приводит совместимые числовые значения старых деталей к текущему формату.
+ * Пустые расчётные значения считаются нулевыми, а десятичная запятая — точкой.
+ */
+const normalizeLegacyWorkpieceNumber = (value, defaultValue) => {
+    if (!value)
+        return defaultValue;
+    if (typeof value !== 'string')
         return value;
-    }, zod_1.z.custom()),
-    docs: zod_1.z.any(),
-    techProcessID: zod_1.z.preprocess(val => typeof val === 'string' && parseInt(val, 10) ? parseInt(val, 10) : null, zod_1.z.number().nullable().optional()),
-    fileBase: zod_1.z.string().optional(),
-    attention: zod_1.z.preprocess(val => (typeof val === 'string' ? val === 'true' : val), zod_1.z.boolean()),
-    discontinued: zod_1.z.preprocess(val => (typeof val === 'string' ? val === 'true' : val), zod_1.z.boolean()),
-    workpiece_characterization: zod_1.z.preprocess(value => {
-        if (typeof value === 'string') {
-            return (0, utils_1.parseParamsOrBody)({ value }, null);
-        }
-        return value;
-    }, zod_1.z.custom())
+    const normalizedValue = value.trim().replace(',', '.');
+    if (!normalizedValue)
+        return defaultValue;
+    const numericValue = Number(normalizedValue);
+    return Number.isFinite(numericValue) ? numericValue : value;
+};
+/**
+ * Нормализует старый multipart-формат клиента, который передаёт только
+ * рассчитанные характеристики заготовки, до полного серверного контракта.
+ */
+const parseWorkpieceCharacteristics = (value) => {
+    var _a, _b;
+    const parsed = (0, utils_1.parseJsonField)(value, default_values_1.defaultworkpieceCharacterization);
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        return parsed;
+    }
+    const characteristics = parsed;
+    const dxl = characteristics.dxl;
+    const normalizedCharacteristics = (0, utils_1.convertStringValuesToNumbers)(Object.assign(Object.assign(Object.assign({}, default_values_1.defaultworkpieceCharacterization), characteristics), { dxl: Object.assign(Object.assign({}, default_values_1.defaultworkpieceCharacterization.dxl), (dxl && typeof dxl === 'object' && !Array.isArray(dxl) ? dxl : {})) }));
+    return Object.assign(Object.assign(Object.assign({}, normalizedCharacteristics), { dxl: {
+            d: normalizeLegacyWorkpieceNumber((_a = normalizedCharacteristics.dxl) === null || _a === void 0 ? void 0 : _a.d, default_values_1.defaultworkpieceCharacterization.dxl.d),
+            l: normalizeLegacyWorkpieceNumber((_b = normalizedCharacteristics.dxl) === null || _b === void 0 ? void 0 : _b.l, default_values_1.defaultworkpieceCharacterization.dxl.l)
+        } }), Object.fromEntries(Object.entries(default_values_1.defaultworkpieceCharacterization)
+        .filter(([key]) => key !== 'dxl')
+        .map(([key, defaultValue]) => [
+        key,
+        normalizeLegacyWorkpieceNumber(normalizedCharacteristics[key], defaultValue)
+    ])));
+};
+exports.DetalParametrsFieldZod = zod_1.z.object({
+    preTime: zod_1.z.object({ ez: zod_1.z.string(), znach: stringOrNumberSchema }),
+    helperTime: zod_1.z.object({ ez: zod_1.z.string(), znach: stringOrNumberSchema }),
+    mainTime: zod_1.z.object({ ez: zod_1.z.string(), znach: stringOrNumberSchema })
+});
+exports.DetalCharacteristicFieldZod = zod_1.z
+    .array(zod_1.z
+    .object({
+    name: zod_1.z.string(),
+    ez: zod_1.z.string(),
+    znach: stringOrNumberSchema
+})
+    .passthrough())
+    .min(1);
+exports.DetalWorkpieceCharacteristicsZod = zod_1.z.object({
+    dxl: zod_1.z.object({ d: zod_1.z.number(), l: zod_1.z.number() }),
+    length: zod_1.z.number(),
+    width: zod_1.z.number(),
+    height: zod_1.z.number(),
+    wallThickness: zod_1.z.number(),
+    outsideDiameter: zod_1.z.number(),
+    thickness: zod_1.z.number(),
+    areaCrossSectional: zod_1.z.number(),
+    acrossFlats: zod_1.z.number(),
+    massPerMeter: zod_1.z.number(),
+    density: zod_1.z.number(),
+    mass: zod_1.z.number(),
+    trash: zod_1.z.number()
+});
+exports.UpCreateDetalDtoZod = zod_1.z.object({
+    id: zod_1.z.preprocess(utils_1.parseOptionalNullableInteger, zod_1.z.number().int().nullish()),
+    name: zod_1.z.string().trim().min(1).max(255),
+    designation: zod_1.z.string().trim().max(255),
+    responsible: zod_1.z.string().trim().min(1),
+    description: zod_1.z.string().max(4000).default(''),
+    parametrs: zod_1.z.preprocess(value => (0, utils_1.parseJsonField)(value, default_values_1.defailtParametrsValue), exports.DetalParametrsFieldZod),
+    characteristic: zod_1.z.preprocess(value => (0, utils_1.parseJsonField)(value, default_values_1.defailtCharacteristicValue), exports.DetalCharacteristicFieldZod),
+    mat_zag: zod_1.z.preprocess(utils_1.parseOptionalNullableInteger, zod_1.z.number().int().nullish()),
+    mat_zag_zam: zod_1.z.preprocess(utils_1.parseOptionalNullableInteger, zod_1.z.number().int().nullish()),
+    materialList: zod_1.z.preprocess(value => (0, utils_1.parseJsonField)(value, []), zod_1.z.custom(value => Array.isArray(value), {
+        message: 'materialList должен быть массивом'
+    })),
+    docs: zod_1.z.any().nullable().default(null),
+    techProcessID: zod_1.z.preprocess(utils_1.parseOptionalNullableInteger, zod_1.z.number().int().nullish()),
+    deletedDocumentIds: zod_1.z.string().optional(),
+    fileBase: zod_1.z.string().default(''),
+    attention: zod_1.z.preprocess(val => (typeof val === 'string' ? val === 'true' : val), zod_1.z.boolean().default(false)),
+    discontinued: zod_1.z.preprocess(val => (typeof val === 'string' ? val === 'true' : val), zod_1.z.boolean().default(false)),
+    workpiece_characterization: zod_1.z.preprocess(parseWorkpieceCharacteristics, exports.DetalWorkpieceCharacteristicsZod)
 });

package/dist/detal/index.d.ts

@@ -4,6 +4,7 @@ export * from './schemas/detal-material.schema';
 export * from './types/detal';
 export * from './interfaces/interface';
 export * from './dto/add-file-to-detal.dto';
+export * from './dto/archive-detal.dto';
 export * from './dto/detal-pagination.dto';
 export * from './dto/get-archive.dto';
 export * from './dto/get-deficit.dto';

package/dist/detal/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./schemas/detal-material.schema"), exports);
 __exportStar(require("./types/detal"), exports);
 __exportStar(require("./interfaces/interface"), exports);
 __exportStar(require("./dto/add-file-to-detal.dto"), exports);
+__exportStar(require("./dto/archive-detal.dto"), exports);
 __exportStar(require("./dto/detal-pagination.dto"), exports);
 __exportStar(require("./dto/get-archive.dto"), exports);
 __exportStar(require("./dto/get-deficit.dto"), exports);