denwa-web-shared 1.0.23 → 1.0.25

package/dist/server/index.cjs.js

@@ -264,6 +264,19 @@ const arrayToKeyValueObject = (arr) => {
     {}
   );
 };
+const preparePageParam = (page) => {
+  if (!page) return 1;
+  if (typeof page === "number") {
+    if (page < 1) return 1;
+    return page;
+  }
+  if (typeof page === "string") {
+    const parsed = parseInt(page);
+    if (Number.isNaN(parsed)) return 1;
+    return parsed;
+  }
+  return 1;
+};
 function r(e) {
   var t, f, n = "";
   if ("string" == typeof e || "number" == typeof e) n += e;
@@ -6521,85 +6534,122 @@ const prepareServerImages = ({
     const serverImages = imagesArray.map((item) => {
       if (!checkCorrectImageObject(item, getError)) return null;
       const type = item.originalFileExtension === "png" ? "image/png" : "image/jpeg";
-      const webpExtension = item.fileExtensions[0];
-      const extension = item.fileExtensions[1];
+      const avifExtension = item.fileExtensions.find((extension2) => extension2 === "avif") ?? "";
+      const webpExtension = item.fileExtensions.find((extension2) => extension2 === "webp") ?? "";
+      const extension = item.fileExtensions.find((extension2) => extension2 === "jpg" || extension2 === "png") ?? "";
       const image1xPrefix = getImagePrefix(item.prefixes, "1hd");
       const image2xPrefix = getImagePrefix(item.prefixes, "2hd");
       const mobileImage1xPrefix = getImagePrefix(item.prefixes, "0.5hd");
       const mobileImage2xPrefix = getImagePrefix(item.prefixes, "1hd");
-      const image1x = getUploadImageUrl({
+      const image1x = extension ? getUploadImageUrl({
         name: item.name,
         extension,
         entityId: item.entityId,
         prefixe: image1xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const image1xWebp = getUploadImageUrl({
+      }) : "";
+      const image1xWebp = webpExtension ? getUploadImageUrl({
         name: item.name,
         extension: webpExtension,
         entityId: item.entityId,
         prefixe: image1xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const image2x = getUploadImageUrl({
+      }) : "";
+      const image1xAvif = avifExtension ? getUploadImageUrl({
+        name: item.name,
+        extension: avifExtension,
+        entityId: item.entityId,
+        prefixe: image1xPrefix,
+        bucketFolder,
+        uploadUrl
+      }) : "";
+      const image2x = extension ? getUploadImageUrl({
         name: item.name,
         extension,
         entityId: item.entityId,
         prefixe: image2xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const image2xWebp = getUploadImageUrl({
+      }) : "";
+      const image2xWebp = webpExtension ? getUploadImageUrl({
         name: item.name,
         extension: webpExtension,
         entityId: item.entityId,
         prefixe: image2xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const mobileImage1x = getUploadImageUrl({
+      }) : "";
+      const image2xAvif = avifExtension ? getUploadImageUrl({
+        name: item.name,
+        extension: avifExtension,
+        entityId: item.entityId,
+        prefixe: image2xPrefix,
+        bucketFolder,
+        uploadUrl
+      }) : "";
+      const mobileImage1x = extension ? getUploadImageUrl({
         name: item.name,
         extension,
         entityId: item.entityId,
         prefixe: mobileImage1xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const mobileImage1xWebp = getUploadImageUrl({
+      }) : "";
+      const mobileImage1xWebp = webpExtension ? getUploadImageUrl({
         name: item.name,
         extension: webpExtension,
         entityId: item.entityId,
         prefixe: mobileImage1xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const mobileImage2x = getUploadImageUrl({
+      }) : "";
+      const mobileImage1xAvif = avifExtension ? getUploadImageUrl({
+        name: item.name,
+        extension: avifExtension,
+        entityId: item.entityId,
+        prefixe: mobileImage1xPrefix,
+        bucketFolder,
+        uploadUrl
+      }) : "";
+      const mobileImage2x = extension ? getUploadImageUrl({
         name: item.name,
         extension,
         entityId: item.entityId,
         prefixe: mobileImage2xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const mobileImage2xWebp = getUploadImageUrl({
+      }) : "";
+      const mobileImage2xWebp = webpExtension ? getUploadImageUrl({
         name: item.name,
         extension: webpExtension,
         entityId: item.entityId,
         prefixe: mobileImage2xPrefix,
         bucketFolder,
         uploadUrl
-      });
+      }) : "";
+      const mobileImage2xAvif = avifExtension ? getUploadImageUrl({
+        name: item.name,
+        extension: avifExtension,
+        entityId: item.entityId,
+        prefixe: mobileImage2xPrefix,
+        bucketFolder,
+        uploadUrl
+      }) : "";
       return {
         image1x,
         image2x,
         image1xWebp,
         image2xWebp,
+        image1xAvif,
+        image2xAvif,
         mobileImage1x,
         mobileImage2x,
         mobileImage1xWebp,
         mobileImage2xWebp,
+        mobileImage1xAvif,
+        mobileImage2xAvif,
         altRU: item.altRU,
         altEN: item.altEN,
         type
@@ -6663,7 +6713,7 @@ const BasePicture = ({
     mobileImage2xAvif
   } = data;
   return /* @__PURE__ */ jsxRuntime.jsxs("picture", { ...pictureProps, children: [
-    mobileImage1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
+    !!mobileImage1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
         srcSet: `${mobileImage1xAvif} 1x${mobileImage2xAvif ? `, ${mobileImage2xAvif} 2x` : ""}`,
@@ -6671,7 +6721,7 @@ const BasePicture = ({
         type: "image/avif"
       }
     ),
-    mobileImage1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
+    !!mobileImage1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
         srcSet: `${mobileImage1xWebp} 1x${mobileImage2xWebp ? `, ${mobileImage2xWebp} 2x` : ""}`,
@@ -6679,7 +6729,7 @@ const BasePicture = ({
         type: "image/webp"
       }
     ),
-    mobileImage1x && /* @__PURE__ */ jsxRuntime.jsx(
+    !!mobileImage1x && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
         srcSet: `${mobileImage1x} 1x${mobileImage2x ? `, ${mobileImage2x} 2x` : ""}`,
@@ -6687,14 +6737,14 @@ const BasePicture = ({
         type
       }
     ),
-    image1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
+    !!image1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
         srcSet: `${image1xAvif} 1x${image2xAvif ? `, ${image2xAvif} 2x` : ""}`,
         type: "image/avif"
       }
     ),
-    image1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
+    !!image1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
         srcSet: `${image1xWebp} 1x${image2xWebp ? `, ${image2xWebp} 2x` : ""}`,
@@ -6731,6 +6781,7 @@ exports.getUploadImageUrl = getUploadImageUrl;
 exports.parseStringToKeyValue = parseStringToKeyValue;
 exports.prepareColor = prepareColor;
 exports.prepareLocalMetaData = prepareLocalMetaData;
+exports.preparePageParam = preparePageParam;
 exports.prepareServerImages = prepareServerImages;
 exports.responseSchema = responseSchema;
 exports.updateTextByTemplate = updateTextByTemplate;

package/dist/server/index.es.js

@@ -262,6 +262,19 @@ const arrayToKeyValueObject = (arr) => {
     {}
   );
 };
+const preparePageParam = (page) => {
+  if (!page) return 1;
+  if (typeof page === "number") {
+    if (page < 1) return 1;
+    return page;
+  }
+  if (typeof page === "string") {
+    const parsed = parseInt(page);
+    if (Number.isNaN(parsed)) return 1;
+    return parsed;
+  }
+  return 1;
+};
 function r(e) {
   var t, f, n = "";
   if ("string" == typeof e || "number" == typeof e) n += e;
@@ -6519,85 +6532,122 @@ const prepareServerImages = ({
     const serverImages = imagesArray.map((item) => {
       if (!checkCorrectImageObject(item, getError)) return null;
       const type = item.originalFileExtension === "png" ? "image/png" : "image/jpeg";
-      const webpExtension = item.fileExtensions[0];
-      const extension = item.fileExtensions[1];
+      const avifExtension = item.fileExtensions.find((extension2) => extension2 === "avif") ?? "";
+      const webpExtension = item.fileExtensions.find((extension2) => extension2 === "webp") ?? "";
+      const extension = item.fileExtensions.find((extension2) => extension2 === "jpg" || extension2 === "png") ?? "";
       const image1xPrefix = getImagePrefix(item.prefixes, "1hd");
       const image2xPrefix = getImagePrefix(item.prefixes, "2hd");
       const mobileImage1xPrefix = getImagePrefix(item.prefixes, "0.5hd");
       const mobileImage2xPrefix = getImagePrefix(item.prefixes, "1hd");
-      const image1x = getUploadImageUrl({
+      const image1x = extension ? getUploadImageUrl({
         name: item.name,
         extension,
         entityId: item.entityId,
         prefixe: image1xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const image1xWebp = getUploadImageUrl({
+      }) : "";
+      const image1xWebp = webpExtension ? getUploadImageUrl({
         name: item.name,
         extension: webpExtension,
         entityId: item.entityId,
         prefixe: image1xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const image2x = getUploadImageUrl({
+      }) : "";
+      const image1xAvif = avifExtension ? getUploadImageUrl({
+        name: item.name,
+        extension: avifExtension,
+        entityId: item.entityId,
+        prefixe: image1xPrefix,
+        bucketFolder,
+        uploadUrl
+      }) : "";
+      const image2x = extension ? getUploadImageUrl({
         name: item.name,
         extension,
         entityId: item.entityId,
         prefixe: image2xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const image2xWebp = getUploadImageUrl({
+      }) : "";
+      const image2xWebp = webpExtension ? getUploadImageUrl({
         name: item.name,
         extension: webpExtension,
         entityId: item.entityId,
         prefixe: image2xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const mobileImage1x = getUploadImageUrl({
+      }) : "";
+      const image2xAvif = avifExtension ? getUploadImageUrl({
+        name: item.name,
+        extension: avifExtension,
+        entityId: item.entityId,
+        prefixe: image2xPrefix,
+        bucketFolder,
+        uploadUrl
+      }) : "";
+      const mobileImage1x = extension ? getUploadImageUrl({
         name: item.name,
         extension,
         entityId: item.entityId,
         prefixe: mobileImage1xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const mobileImage1xWebp = getUploadImageUrl({
+      }) : "";
+      const mobileImage1xWebp = webpExtension ? getUploadImageUrl({
         name: item.name,
         extension: webpExtension,
         entityId: item.entityId,
         prefixe: mobileImage1xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const mobileImage2x = getUploadImageUrl({
+      }) : "";
+      const mobileImage1xAvif = avifExtension ? getUploadImageUrl({
+        name: item.name,
+        extension: avifExtension,
+        entityId: item.entityId,
+        prefixe: mobileImage1xPrefix,
+        bucketFolder,
+        uploadUrl
+      }) : "";
+      const mobileImage2x = extension ? getUploadImageUrl({
         name: item.name,
         extension,
         entityId: item.entityId,
         prefixe: mobileImage2xPrefix,
         bucketFolder,
         uploadUrl
-      });
-      const mobileImage2xWebp = getUploadImageUrl({
+      }) : "";
+      const mobileImage2xWebp = webpExtension ? getUploadImageUrl({
         name: item.name,
         extension: webpExtension,
         entityId: item.entityId,
         prefixe: mobileImage2xPrefix,
         bucketFolder,
         uploadUrl
-      });
+      }) : "";
+      const mobileImage2xAvif = avifExtension ? getUploadImageUrl({
+        name: item.name,
+        extension: avifExtension,
+        entityId: item.entityId,
+        prefixe: mobileImage2xPrefix,
+        bucketFolder,
+        uploadUrl
+      }) : "";
       return {
         image1x,
         image2x,
         image1xWebp,
         image2xWebp,
+        image1xAvif,
+        image2xAvif,
         mobileImage1x,
         mobileImage2x,
         mobileImage1xWebp,
         mobileImage2xWebp,
+        mobileImage1xAvif,
+        mobileImage2xAvif,
         altRU: item.altRU,
         altEN: item.altEN,
         type
@@ -6661,7 +6711,7 @@ const BasePicture = ({
     mobileImage2xAvif
   } = data;
   return /* @__PURE__ */ jsxs("picture", { ...pictureProps, children: [
-    mobileImage1xAvif && /* @__PURE__ */ jsx(
+    !!mobileImage1xAvif && /* @__PURE__ */ jsx(
       "source",
       {
         srcSet: `${mobileImage1xAvif} 1x${mobileImage2xAvif ? `, ${mobileImage2xAvif} 2x` : ""}`,
@@ -6669,7 +6719,7 @@ const BasePicture = ({
         type: "image/avif"
       }
     ),
-    mobileImage1xWebp && /* @__PURE__ */ jsx(
+    !!mobileImage1xWebp && /* @__PURE__ */ jsx(
       "source",
       {
         srcSet: `${mobileImage1xWebp} 1x${mobileImage2xWebp ? `, ${mobileImage2xWebp} 2x` : ""}`,
@@ -6677,7 +6727,7 @@ const BasePicture = ({
         type: "image/webp"
       }
     ),
-    mobileImage1x && /* @__PURE__ */ jsx(
+    !!mobileImage1x && /* @__PURE__ */ jsx(
       "source",
       {
         srcSet: `${mobileImage1x} 1x${mobileImage2x ? `, ${mobileImage2x} 2x` : ""}`,
@@ -6685,14 +6735,14 @@ const BasePicture = ({
         type
       }
     ),
-    image1xAvif && /* @__PURE__ */ jsx(
+    !!image1xAvif && /* @__PURE__ */ jsx(
       "source",
       {
         srcSet: `${image1xAvif} 1x${image2xAvif ? `, ${image2xAvif} 2x` : ""}`,
         type: "image/avif"
       }
     ),
-    image1xWebp && /* @__PURE__ */ jsx(
+    !!image1xWebp && /* @__PURE__ */ jsx(
       "source",
       {
         srcSet: `${image1xWebp} 1x${image2xWebp ? `, ${image2xWebp} 2x` : ""}`,
@@ -6730,6 +6780,7 @@ export {
   parseStringToKeyValue,
   prepareColor,
   prepareLocalMetaData,
+  preparePageParam,
   prepareServerImages,
   responseSchema,
   updateTextByTemplate

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

@@ -129,3 +129,8 @@ export declare const generatePaginationArray: (pagination: IPaginate | null, bas
  * @param arr - Массив
  */
 export declare const arrayToKeyValueObject: <T extends string>(arr: T[]) => Record<T, T>;
+/**
+ * @description Подготовка номера страницы, полученной из query параметров
+ * @param page - Номер страницы
+ */
+export declare const preparePageParam: (page: string | number | undefined) => number;

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

@@ -13,10 +13,14 @@ export interface IPreparedServerImage {
     image2x: string;
     image1xWebp: string;
     image2xWebp: string;
+    image1xAvif: string;
+    image2xAvif: string;
     mobileImage1x?: string;
     mobileImage2x?: string;
     mobileImage1xWebp?: string;
     mobileImage2xWebp?: string;
+    mobileImage1xAvif?: string;
+    mobileImage2xAvif?: string;
     altRU?: string;
     altEN?: string;
     type: ImageType;

package/package.json

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