denwa-web-shared 1.0.26 → 1.0.29

package/dist/server/index.cjs.js

@@ -77,6 +77,7 @@ const updateTextByTemplate = ({
   SUBDOMAIN_NAME,
   SUBDOMAIN_MASK
 }) => {
+  if (!subdomain || !SUBDOMAIN_NAME || !SUBDOMAIN_MASK) return text;
   const key = SUBDOMAIN_NAME[subdomain];
   if (!subdomain || !key) return text;
   const subdomainData = getByKey(SUBDOMAIN_NAME, subdomain);
@@ -6496,25 +6497,68 @@ function refine(fn, _params = {}) {
 function superRefine(fn) {
   return _superRefine(fn);
 }
+const responseSchema = object({
+  statusCode: number().optional(),
+  message: string().optional().nullable(),
+  messages: string().array().optional().nullable(),
+  data: any().optional().nullable(),
+  error: object({
+    statusCode: number(),
+    message: string().optional().nullable(),
+    messages: string().array().optional().nullable()
+  }).optional().nullable(),
+  response: any().optional().nullable()
+});
+const serverImageSchema = object({
+  altRU: string().optional().nullable(),
+  altEN: string().optional().nullable(),
+  altAR: string().optional().nullable(),
+  name: string(),
+  originalFileExtension: string(),
+  fileExtensions: string().array(),
+  prefixes: string().array(),
+  folder: string().optional()
+});
+const serverFileSchema = object({
+  name: string(),
+  fullName: string(),
+  extension: string(),
+  entityId: string().uuid(),
+  fullPathExample: string(),
+  folder: string().optional()
+});
 const getUploadImageUrl = ({
   name,
   extension,
   entityId,
   prefixe,
   bucketFolder,
+  folder,
+  uploadUrl
+}) => {
+  return `${uploadUrl}/${bucketFolder}/${entityId}${folder ? `/${folder}` : ""}/${name}-${prefixe}.${extension}`;
+};
+const getUploadFileUrl = ({
+  fullName,
+  entityId,
+  folder,
+  bucketFolder,
   uploadUrl
 }) => {
-  return `${uploadUrl}/${bucketFolder}/${entityId}/${name}-${prefixe}.${extension}`;
+  return `${uploadUrl}/${bucketFolder}/${entityId}${folder ? `/${folder}` : ""}/${fullName}`;
 };
-const checkCorrectImageObject = (object$1, getError) => {
+const checkCorrectImageObject = (object2, getError) => {
   try {
-    object({
-      altRU: string().optional().nullable(),
-      altEN: string().optional().nullable(),
-      name: string(),
-      originalFileExtension: string(),
-      fileExtensions: string().array()
-    }).parse(object$1);
+    serverImageSchema.parse(object2);
+    return true;
+  } catch (error) {
+    getError({ error });
+    return false;
+  }
+};
+const checkCorrectFileObject = (object2, getError) => {
+  try {
+    serverFileSchema.parse(object2);
     return true;
   } catch (error) {
     getError({ error });
@@ -6677,18 +6721,6 @@ const getImagePrefix = (prefixes, type) => {
       return prefixes[5] ?? "";
   }
 };
-const responseSchema = object({
-  statusCode: number().optional(),
-  message: string().optional().nullable(),
-  messages: string().array().optional().nullable(),
-  data: any().optional().nullable(),
-  error: object({
-    statusCode: number(),
-    message: string().optional().nullable(),
-    messages: string().array().optional().nullable()
-  }).optional().nullable(),
-  response: any().optional().nullable()
-});
 const BasePicture = ({
   imgProps,
   data,
@@ -6769,6 +6801,7 @@ exports.BasePicture = BasePicture;
 exports.THEME = THEME;
 exports.TIME = TIME;
 exports.arrayToKeyValueObject = arrayToKeyValueObject;
+exports.checkCorrectFileObject = checkCorrectFileObject;
 exports.checkCorrectImageObject = checkCorrectImageObject;
 exports.cn = cn;
 exports.convertPhoneMask = convertPhoneMask;
@@ -6777,6 +6810,7 @@ exports.getByKey = getByKey;
 exports.getImagePrefix = getImagePrefix;
 exports.getNumberFormatter = getNumberFormatter;
 exports.getSubdomain = getSubdomain;
+exports.getUploadFileUrl = getUploadFileUrl;
 exports.getUploadImageUrl = getUploadImageUrl;
 exports.parseStringToKeyValue = parseStringToKeyValue;
 exports.prepareColor = prepareColor;
@@ -6784,4 +6818,6 @@ exports.prepareLocalMetaData = prepareLocalMetaData;
 exports.preparePageParam = preparePageParam;
 exports.prepareServerImages = prepareServerImages;
 exports.responseSchema = responseSchema;
+exports.serverFileSchema = serverFileSchema;
+exports.serverImageSchema = serverImageSchema;
 exports.updateTextByTemplate = updateTextByTemplate;

package/dist/server/index.es.js

@@ -75,6 +75,7 @@ const updateTextByTemplate = ({
   SUBDOMAIN_NAME,
   SUBDOMAIN_MASK
 }) => {
+  if (!subdomain || !SUBDOMAIN_NAME || !SUBDOMAIN_MASK) return text;
   const key = SUBDOMAIN_NAME[subdomain];
   if (!subdomain || !key) return text;
   const subdomainData = getByKey(SUBDOMAIN_NAME, subdomain);
@@ -6494,25 +6495,68 @@ function refine(fn, _params = {}) {
 function superRefine(fn) {
   return _superRefine(fn);
 }
+const responseSchema = object({
+  statusCode: number().optional(),
+  message: string().optional().nullable(),
+  messages: string().array().optional().nullable(),
+  data: any().optional().nullable(),
+  error: object({
+    statusCode: number(),
+    message: string().optional().nullable(),
+    messages: string().array().optional().nullable()
+  }).optional().nullable(),
+  response: any().optional().nullable()
+});
+const serverImageSchema = object({
+  altRU: string().optional().nullable(),
+  altEN: string().optional().nullable(),
+  altAR: string().optional().nullable(),
+  name: string(),
+  originalFileExtension: string(),
+  fileExtensions: string().array(),
+  prefixes: string().array(),
+  folder: string().optional()
+});
+const serverFileSchema = object({
+  name: string(),
+  fullName: string(),
+  extension: string(),
+  entityId: string().uuid(),
+  fullPathExample: string(),
+  folder: string().optional()
+});
 const getUploadImageUrl = ({
   name,
   extension,
   entityId,
   prefixe,
   bucketFolder,
+  folder,
+  uploadUrl
+}) => {
+  return `${uploadUrl}/${bucketFolder}/${entityId}${folder ? `/${folder}` : ""}/${name}-${prefixe}.${extension}`;
+};
+const getUploadFileUrl = ({
+  fullName,
+  entityId,
+  folder,
+  bucketFolder,
   uploadUrl
 }) => {
-  return `${uploadUrl}/${bucketFolder}/${entityId}/${name}-${prefixe}.${extension}`;
+  return `${uploadUrl}/${bucketFolder}/${entityId}${folder ? `/${folder}` : ""}/${fullName}`;
 };
-const checkCorrectImageObject = (object$1, getError) => {
+const checkCorrectImageObject = (object2, getError) => {
   try {
-    object({
-      altRU: string().optional().nullable(),
-      altEN: string().optional().nullable(),
-      name: string(),
-      originalFileExtension: string(),
-      fileExtensions: string().array()
-    }).parse(object$1);
+    serverImageSchema.parse(object2);
+    return true;
+  } catch (error) {
+    getError({ error });
+    return false;
+  }
+};
+const checkCorrectFileObject = (object2, getError) => {
+  try {
+    serverFileSchema.parse(object2);
     return true;
   } catch (error) {
     getError({ error });
@@ -6675,18 +6719,6 @@ const getImagePrefix = (prefixes, type) => {
       return prefixes[5] ?? "";
   }
 };
-const responseSchema = object({
-  statusCode: number().optional(),
-  message: string().optional().nullable(),
-  messages: string().array().optional().nullable(),
-  data: any().optional().nullable(),
-  error: object({
-    statusCode: number(),
-    message: string().optional().nullable(),
-    messages: string().array().optional().nullable()
-  }).optional().nullable(),
-  response: any().optional().nullable()
-});
 const BasePicture = ({
   imgProps,
   data,
@@ -6768,6 +6800,7 @@ export {
   THEME,
   TIME,
   arrayToKeyValueObject,
+  checkCorrectFileObject,
   checkCorrectImageObject,
   cn,
   convertPhoneMask,
@@ -6776,6 +6809,7 @@ export {
   getImagePrefix,
   getNumberFormatter,
   getSubdomain,
+  getUploadFileUrl,
   getUploadImageUrl,
   parseStringToKeyValue,
   prepareColor,
@@ -6783,5 +6817,7 @@ export {
   preparePageParam,
   prepareServerImages,
   responseSchema,
+  serverFileSchema,
+  serverImageSchema,
   updateTextByTemplate
 };

package/dist/server/lib/{images.d.ts → files.d.ts}

@@ -1,4 +1,4 @@
-import { IPreparedServerImage, IServerImage } from '../types';
+import { GetErrorType, IPreparedServerImage, IServerFile, IServerImage } from '../types';
 /**
  * @description Создает url картинки
  * @param {string} name - название картинки
@@ -7,26 +7,47 @@ import { IPreparedServerImage, IServerImage } from '../types';
  * @param {string} bucketName - название бакета картинки
  * @param {string} prefixe - префикс файла
  * @param {string} uploadUrl - url бакета
+ * @param {string | undefined} folder - подпапка
  * @param bucketFolder - enum с папкой бакета
  * @response Возвращает url
  */
-export declare const getUploadImageUrl: <T>({ name, extension, entityId, prefixe, bucketFolder, uploadUrl, }: {
+export declare const getUploadImageUrl: <T>({ name, extension, entityId, prefixe, bucketFolder, folder, uploadUrl, }: {
     name: string;
     extension: string;
     entityId: string;
     prefixe: string;
     uploadUrl: string;
+    folder?: string;
+    bucketFolder: T;
+}) => string;
+/**
+ * @description Создает url файла
+ * @param { string } fullName - название файла
+ * @param { string } entityId - id сущности
+ * @param { string | undefined } folder - название подпапки
+ * @param { string } uploadUrl - url бакета
+ * @param bucketFolder - enum с папкой бакета
+ * @response Возвращает url
+ */
+export declare const getUploadFileUrl: <T>({ fullName, entityId, folder, bucketFolder, uploadUrl, }: {
+    fullName: string;
+    entityId: string;
+    folder?: string;
+    uploadUrl: string;
     bucketFolder: T;
 }) => string;
 /**
  * @description Проверяет валидность объекта картинки по схеме
  * @param {object} object - объект с информацией о картинке
- * @param getError - функция обработки ошибок
  * @response Возвращает true/false
  */
-export declare const checkCorrectImageObject: (object: IServerImage, getError: ({ error }: {
-    error: unknown;
-}) => void) => boolean;
+export declare const checkCorrectImageObject: (object: IServerImage, getError: GetErrorType) => boolean;
+/**
+ * @description Проверяет валидность объекта файла по схеме
+ * @param {object} object - объект с информацией о файле
+ * @response Возвращает true/false
+ */
+export declare const checkCorrectFileObject: (object: IServerFile, getError: GetErrorType) => boolean;
 /**
  * @description Преобразует фотографии с сервера в формат для работы
  * @param {string | undefined | null} images - json stringify строка с информацией
@@ -39,8 +60,6 @@ export declare const prepareServerImages: <T>({ images, bucketFolder, uploadUrl,
     images: string | undefined | null;
     bucketFolder: T;
     uploadUrl: string;
-    getError: ({ error }: {
-        error: unknown;
-    }) => void;
+    getError: GetErrorType;
 }) => IPreparedServerImage[];
 export declare const getImagePrefix: (prefixes: string[], type: "original" | "0.25hd" | "0.5hd" | "1hd" | "2hd" | "4hd") => string;

package/dist/server/lib/index.d.ts

@@ -1,3 +1,3 @@
 export * from './utils';
 export * from './css';
-export * from './images';
+export * from './files';

package/dist/server/lib/utils.d.ts

@@ -36,14 +36,14 @@ export declare const getSubdomain: (host: string, SUB_DOMAIN: Record<string, str
  */
 export declare const updateTextByTemplate: ({ text, subdomain, SUBDOMAIN_NAME, SUBDOMAIN_MASK, }: {
     text: string;
-    subdomain: string;
-    SUBDOMAIN_NAME: Record<string, {
+    subdomain?: string;
+    SUBDOMAIN_NAME?: Record<string, {
         name: string;
         declination: string;
         region: string;
         regionDeclination: string;
     }>;
-    SUBDOMAIN_MASK: {
+    SUBDOMAIN_MASK?: {
         CITY: string;
         CITY_DECL: string;
         CITY_REGION: string;
@@ -63,7 +63,7 @@ export declare const updateTextByTemplate: ({ text, subdomain, SUBDOMAIN_NAME, S
  * @return Объект с мета тегами
  */
 export declare const prepareLocalMetaData: <T extends object>({ subdomain, metaData, host, lang, isSubdomain, SUBDOMAIN_NAME, SUBDOMAIN_MASK, DEFAULT_SEO_TEXT, }: {
-    subdomain: string;
+    subdomain?: string;
     metaData: {
         title: string;
         description: string;
@@ -79,13 +79,13 @@ export declare const prepareLocalMetaData: <T extends object>({ subdomain, metaD
         city?: string;
     };
     isSubdomain?: boolean;
-    SUBDOMAIN_NAME: Record<string, {
+    SUBDOMAIN_NAME?: Record<string, {
         name: string;
         declination: string;
         region: string;
         regionDeclination: string;
     }>;
-    SUBDOMAIN_MASK: {
+    SUBDOMAIN_MASK?: {
         CITY: string;
         CITY_DECL: string;
         CITY_REGION: string;

package/dist/server/schemas/index.d.ts

@@ -11,3 +11,21 @@ export declare const responseSchema: z.ZodObject<{
     }, z.core.$strip>>>;
     response: z.ZodNullable<z.ZodOptional<z.ZodAny>>;
 }, z.core.$strip>;
+export declare const serverImageSchema: z.ZodObject<{
+    altRU: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+    altEN: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+    altAR: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+    name: z.ZodString;
+    originalFileExtension: z.ZodString;
+    fileExtensions: z.ZodArray<z.ZodString>;
+    prefixes: z.ZodArray<z.ZodString>;
+    folder: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+export declare const serverFileSchema: z.ZodObject<{
+    name: z.ZodString;
+    fullName: z.ZodString;
+    extension: z.ZodString;
+    entityId: z.ZodString;
+    fullPathExample: z.ZodString;
+    folder: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;

package/dist/server/types/index.d.ts

@@ -1,13 +1,23 @@
 export interface IServerImage {
     altRU?: string;
     altEN?: string;
+    altAR?: string;
     name: string;
     originalFileExtension: string;
     entityId: string;
     fullPathExample: string;
+    folder?: string;
     prefixes: string[];
     fileExtensions: string[];
 }
+export interface IServerFile {
+    name: string;
+    fullName: string;
+    extension: string;
+    entityId: string;
+    fullPathExample: string;
+    folder?: string;
+}
 export interface IPreparedServerImage {
     image1x: string;
     image2x: string;
@@ -23,6 +33,7 @@ export interface IPreparedServerImage {
     mobileImage2xAvif?: string;
     altRU?: string;
     altEN?: string;
+    altAR?: string;
     type: ImageType;
 }
 export type ImageType = 'image/png' | 'image/jpeg';
@@ -44,3 +55,7 @@ export interface PaginationResult {
     firstPage?: PaginationButton;
     lastPage?: PaginationButton;
 }
+export type GetErrorType = ({ error, message }: {
+    error?: unknown;
+    message?: string;
+}) => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "denwa-web-shared",
   "private": false,
-  "version": "1.0.26",
+  "version": "1.0.29",
   "type": "module",
   "author": "Denwa",
   "main": "dist/denwa-web-shared.cjs.js",