denwa-web-shared 1.0.23 → 1.0.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6521,85 +6521,122 @@ const prepareServerImages = ({
6521
6521
  const serverImages = imagesArray.map((item) => {
6522
6522
  if (!checkCorrectImageObject(item, getError)) return null;
6523
6523
  const type = item.originalFileExtension === "png" ? "image/png" : "image/jpeg";
6524
- const webpExtension = item.fileExtensions[0];
6525
- const extension = item.fileExtensions[1];
6524
+ const avifExtension = item.fileExtensions.find((extension2) => extension2 === "avif") ?? "";
6525
+ const webpExtension = item.fileExtensions.find((extension2) => extension2 === "webp") ?? "";
6526
+ const extension = item.fileExtensions.find((extension2) => extension2 === "jpg" || extension2 === "png") ?? "";
6526
6527
  const image1xPrefix = getImagePrefix(item.prefixes, "1hd");
6527
6528
  const image2xPrefix = getImagePrefix(item.prefixes, "2hd");
6528
6529
  const mobileImage1xPrefix = getImagePrefix(item.prefixes, "0.5hd");
6529
6530
  const mobileImage2xPrefix = getImagePrefix(item.prefixes, "1hd");
6530
- const image1x = getUploadImageUrl({
6531
+ const image1x = extension ? getUploadImageUrl({
6531
6532
  name: item.name,
6532
6533
  extension,
6533
6534
  entityId: item.entityId,
6534
6535
  prefixe: image1xPrefix,
6535
6536
  bucketFolder,
6536
6537
  uploadUrl
6537
- });
6538
- const image1xWebp = getUploadImageUrl({
6538
+ }) : "";
6539
+ const image1xWebp = webpExtension ? getUploadImageUrl({
6539
6540
  name: item.name,
6540
6541
  extension: webpExtension,
6541
6542
  entityId: item.entityId,
6542
6543
  prefixe: image1xPrefix,
6543
6544
  bucketFolder,
6544
6545
  uploadUrl
6545
- });
6546
- const image2x = getUploadImageUrl({
6546
+ }) : "";
6547
+ const image1xAvif = avifExtension ? getUploadImageUrl({
6548
+ name: item.name,
6549
+ extension: avifExtension,
6550
+ entityId: item.entityId,
6551
+ prefixe: image1xPrefix,
6552
+ bucketFolder,
6553
+ uploadUrl
6554
+ }) : "";
6555
+ const image2x = extension ? getUploadImageUrl({
6547
6556
  name: item.name,
6548
6557
  extension,
6549
6558
  entityId: item.entityId,
6550
6559
  prefixe: image2xPrefix,
6551
6560
  bucketFolder,
6552
6561
  uploadUrl
6553
- });
6554
- const image2xWebp = getUploadImageUrl({
6562
+ }) : "";
6563
+ const image2xWebp = webpExtension ? getUploadImageUrl({
6555
6564
  name: item.name,
6556
6565
  extension: webpExtension,
6557
6566
  entityId: item.entityId,
6558
6567
  prefixe: image2xPrefix,
6559
6568
  bucketFolder,
6560
6569
  uploadUrl
6561
- });
6562
- const mobileImage1x = getUploadImageUrl({
6570
+ }) : "";
6571
+ const image2xAvif = avifExtension ? getUploadImageUrl({
6572
+ name: item.name,
6573
+ extension: avifExtension,
6574
+ entityId: item.entityId,
6575
+ prefixe: image2xPrefix,
6576
+ bucketFolder,
6577
+ uploadUrl
6578
+ }) : "";
6579
+ const mobileImage1x = extension ? getUploadImageUrl({
6563
6580
  name: item.name,
6564
6581
  extension,
6565
6582
  entityId: item.entityId,
6566
6583
  prefixe: mobileImage1xPrefix,
6567
6584
  bucketFolder,
6568
6585
  uploadUrl
6569
- });
6570
- const mobileImage1xWebp = getUploadImageUrl({
6586
+ }) : "";
6587
+ const mobileImage1xWebp = webpExtension ? getUploadImageUrl({
6571
6588
  name: item.name,
6572
6589
  extension: webpExtension,
6573
6590
  entityId: item.entityId,
6574
6591
  prefixe: mobileImage1xPrefix,
6575
6592
  bucketFolder,
6576
6593
  uploadUrl
6577
- });
6578
- const mobileImage2x = getUploadImageUrl({
6594
+ }) : "";
6595
+ const mobileImage1xAvif = avifExtension ? getUploadImageUrl({
6596
+ name: item.name,
6597
+ extension: avifExtension,
6598
+ entityId: item.entityId,
6599
+ prefixe: mobileImage1xPrefix,
6600
+ bucketFolder,
6601
+ uploadUrl
6602
+ }) : "";
6603
+ const mobileImage2x = extension ? getUploadImageUrl({
6579
6604
  name: item.name,
6580
6605
  extension,
6581
6606
  entityId: item.entityId,
6582
6607
  prefixe: mobileImage2xPrefix,
6583
6608
  bucketFolder,
6584
6609
  uploadUrl
6585
- });
6586
- const mobileImage2xWebp = getUploadImageUrl({
6610
+ }) : "";
6611
+ const mobileImage2xWebp = webpExtension ? getUploadImageUrl({
6587
6612
  name: item.name,
6588
6613
  extension: webpExtension,
6589
6614
  entityId: item.entityId,
6590
6615
  prefixe: mobileImage2xPrefix,
6591
6616
  bucketFolder,
6592
6617
  uploadUrl
6593
- });
6618
+ }) : "";
6619
+ const mobileImage2xAvif = avifExtension ? getUploadImageUrl({
6620
+ name: item.name,
6621
+ extension: avifExtension,
6622
+ entityId: item.entityId,
6623
+ prefixe: mobileImage2xPrefix,
6624
+ bucketFolder,
6625
+ uploadUrl
6626
+ }) : "";
6594
6627
  return {
6595
6628
  image1x,
6596
6629
  image2x,
6597
6630
  image1xWebp,
6598
6631
  image2xWebp,
6632
+ image1xAvif,
6633
+ image2xAvif,
6599
6634
  mobileImage1x,
6600
6635
  mobileImage2x,
6601
6636
  mobileImage1xWebp,
6602
6637
  mobileImage2xWebp,
6638
+ mobileImage1xAvif,
6639
+ mobileImage2xAvif,
6603
6640
  altRU: item.altRU,
6604
6641
  altEN: item.altEN,
6605
6642
  type
@@ -6663,7 +6700,7 @@ const BasePicture = ({
6663
6700
  mobileImage2xAvif
6664
6701
  } = data;
6665
6702
  return /* @__PURE__ */ jsxRuntime.jsxs("picture", { ...pictureProps, children: [
6666
- mobileImage1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
6703
+ !!mobileImage1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
6667
6704
  "source",
6668
6705
  {
6669
6706
  srcSet: `${mobileImage1xAvif} 1x${mobileImage2xAvif ? `, ${mobileImage2xAvif} 2x` : ""}`,
@@ -6671,7 +6708,7 @@ const BasePicture = ({
6671
6708
  type: "image/avif"
6672
6709
  }
6673
6710
  ),
6674
- mobileImage1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
6711
+ !!mobileImage1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
6675
6712
  "source",
6676
6713
  {
6677
6714
  srcSet: `${mobileImage1xWebp} 1x${mobileImage2xWebp ? `, ${mobileImage2xWebp} 2x` : ""}`,
@@ -6679,7 +6716,7 @@ const BasePicture = ({
6679
6716
  type: "image/webp"
6680
6717
  }
6681
6718
  ),
6682
- mobileImage1x && /* @__PURE__ */ jsxRuntime.jsx(
6719
+ !!mobileImage1x && /* @__PURE__ */ jsxRuntime.jsx(
6683
6720
  "source",
6684
6721
  {
6685
6722
  srcSet: `${mobileImage1x} 1x${mobileImage2x ? `, ${mobileImage2x} 2x` : ""}`,
@@ -6687,14 +6724,14 @@ const BasePicture = ({
6687
6724
  type
6688
6725
  }
6689
6726
  ),
6690
- image1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
6727
+ !!image1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
6691
6728
  "source",
6692
6729
  {
6693
6730
  srcSet: `${image1xAvif} 1x${image2xAvif ? `, ${image2xAvif} 2x` : ""}`,
6694
6731
  type: "image/avif"
6695
6732
  }
6696
6733
  ),
6697
- image1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
6734
+ !!image1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
6698
6735
  "source",
6699
6736
  {
6700
6737
  srcSet: `${image1xWebp} 1x${image2xWebp ? `, ${image2xWebp} 2x` : ""}`,
@@ -6519,85 +6519,122 @@ const prepareServerImages = ({
6519
6519
  const serverImages = imagesArray.map((item) => {
6520
6520
  if (!checkCorrectImageObject(item, getError)) return null;
6521
6521
  const type = item.originalFileExtension === "png" ? "image/png" : "image/jpeg";
6522
- const webpExtension = item.fileExtensions[0];
6523
- const extension = item.fileExtensions[1];
6522
+ const avifExtension = item.fileExtensions.find((extension2) => extension2 === "avif") ?? "";
6523
+ const webpExtension = item.fileExtensions.find((extension2) => extension2 === "webp") ?? "";
6524
+ const extension = item.fileExtensions.find((extension2) => extension2 === "jpg" || extension2 === "png") ?? "";
6524
6525
  const image1xPrefix = getImagePrefix(item.prefixes, "1hd");
6525
6526
  const image2xPrefix = getImagePrefix(item.prefixes, "2hd");
6526
6527
  const mobileImage1xPrefix = getImagePrefix(item.prefixes, "0.5hd");
6527
6528
  const mobileImage2xPrefix = getImagePrefix(item.prefixes, "1hd");
6528
- const image1x = getUploadImageUrl({
6529
+ const image1x = extension ? getUploadImageUrl({
6529
6530
  name: item.name,
6530
6531
  extension,
6531
6532
  entityId: item.entityId,
6532
6533
  prefixe: image1xPrefix,
6533
6534
  bucketFolder,
6534
6535
  uploadUrl
6535
- });
6536
- const image1xWebp = getUploadImageUrl({
6536
+ }) : "";
6537
+ const image1xWebp = webpExtension ? getUploadImageUrl({
6537
6538
  name: item.name,
6538
6539
  extension: webpExtension,
6539
6540
  entityId: item.entityId,
6540
6541
  prefixe: image1xPrefix,
6541
6542
  bucketFolder,
6542
6543
  uploadUrl
6543
- });
6544
- const image2x = getUploadImageUrl({
6544
+ }) : "";
6545
+ const image1xAvif = avifExtension ? getUploadImageUrl({
6546
+ name: item.name,
6547
+ extension: avifExtension,
6548
+ entityId: item.entityId,
6549
+ prefixe: image1xPrefix,
6550
+ bucketFolder,
6551
+ uploadUrl
6552
+ }) : "";
6553
+ const image2x = extension ? getUploadImageUrl({
6545
6554
  name: item.name,
6546
6555
  extension,
6547
6556
  entityId: item.entityId,
6548
6557
  prefixe: image2xPrefix,
6549
6558
  bucketFolder,
6550
6559
  uploadUrl
6551
- });
6552
- const image2xWebp = getUploadImageUrl({
6560
+ }) : "";
6561
+ const image2xWebp = webpExtension ? getUploadImageUrl({
6553
6562
  name: item.name,
6554
6563
  extension: webpExtension,
6555
6564
  entityId: item.entityId,
6556
6565
  prefixe: image2xPrefix,
6557
6566
  bucketFolder,
6558
6567
  uploadUrl
6559
- });
6560
- const mobileImage1x = getUploadImageUrl({
6568
+ }) : "";
6569
+ const image2xAvif = avifExtension ? getUploadImageUrl({
6570
+ name: item.name,
6571
+ extension: avifExtension,
6572
+ entityId: item.entityId,
6573
+ prefixe: image2xPrefix,
6574
+ bucketFolder,
6575
+ uploadUrl
6576
+ }) : "";
6577
+ const mobileImage1x = extension ? getUploadImageUrl({
6561
6578
  name: item.name,
6562
6579
  extension,
6563
6580
  entityId: item.entityId,
6564
6581
  prefixe: mobileImage1xPrefix,
6565
6582
  bucketFolder,
6566
6583
  uploadUrl
6567
- });
6568
- const mobileImage1xWebp = getUploadImageUrl({
6584
+ }) : "";
6585
+ const mobileImage1xWebp = webpExtension ? getUploadImageUrl({
6569
6586
  name: item.name,
6570
6587
  extension: webpExtension,
6571
6588
  entityId: item.entityId,
6572
6589
  prefixe: mobileImage1xPrefix,
6573
6590
  bucketFolder,
6574
6591
  uploadUrl
6575
- });
6576
- const mobileImage2x = getUploadImageUrl({
6592
+ }) : "";
6593
+ const mobileImage1xAvif = avifExtension ? getUploadImageUrl({
6594
+ name: item.name,
6595
+ extension: avifExtension,
6596
+ entityId: item.entityId,
6597
+ prefixe: mobileImage1xPrefix,
6598
+ bucketFolder,
6599
+ uploadUrl
6600
+ }) : "";
6601
+ const mobileImage2x = extension ? getUploadImageUrl({
6577
6602
  name: item.name,
6578
6603
  extension,
6579
6604
  entityId: item.entityId,
6580
6605
  prefixe: mobileImage2xPrefix,
6581
6606
  bucketFolder,
6582
6607
  uploadUrl
6583
- });
6584
- const mobileImage2xWebp = getUploadImageUrl({
6608
+ }) : "";
6609
+ const mobileImage2xWebp = webpExtension ? getUploadImageUrl({
6585
6610
  name: item.name,
6586
6611
  extension: webpExtension,
6587
6612
  entityId: item.entityId,
6588
6613
  prefixe: mobileImage2xPrefix,
6589
6614
  bucketFolder,
6590
6615
  uploadUrl
6591
- });
6616
+ }) : "";
6617
+ const mobileImage2xAvif = avifExtension ? getUploadImageUrl({
6618
+ name: item.name,
6619
+ extension: avifExtension,
6620
+ entityId: item.entityId,
6621
+ prefixe: mobileImage2xPrefix,
6622
+ bucketFolder,
6623
+ uploadUrl
6624
+ }) : "";
6592
6625
  return {
6593
6626
  image1x,
6594
6627
  image2x,
6595
6628
  image1xWebp,
6596
6629
  image2xWebp,
6630
+ image1xAvif,
6631
+ image2xAvif,
6597
6632
  mobileImage1x,
6598
6633
  mobileImage2x,
6599
6634
  mobileImage1xWebp,
6600
6635
  mobileImage2xWebp,
6636
+ mobileImage1xAvif,
6637
+ mobileImage2xAvif,
6601
6638
  altRU: item.altRU,
6602
6639
  altEN: item.altEN,
6603
6640
  type
@@ -6661,7 +6698,7 @@ const BasePicture = ({
6661
6698
  mobileImage2xAvif
6662
6699
  } = data;
6663
6700
  return /* @__PURE__ */ jsxs("picture", { ...pictureProps, children: [
6664
- mobileImage1xAvif && /* @__PURE__ */ jsx(
6701
+ !!mobileImage1xAvif && /* @__PURE__ */ jsx(
6665
6702
  "source",
6666
6703
  {
6667
6704
  srcSet: `${mobileImage1xAvif} 1x${mobileImage2xAvif ? `, ${mobileImage2xAvif} 2x` : ""}`,
@@ -6669,7 +6706,7 @@ const BasePicture = ({
6669
6706
  type: "image/avif"
6670
6707
  }
6671
6708
  ),
6672
- mobileImage1xWebp && /* @__PURE__ */ jsx(
6709
+ !!mobileImage1xWebp && /* @__PURE__ */ jsx(
6673
6710
  "source",
6674
6711
  {
6675
6712
  srcSet: `${mobileImage1xWebp} 1x${mobileImage2xWebp ? `, ${mobileImage2xWebp} 2x` : ""}`,
@@ -6677,7 +6714,7 @@ const BasePicture = ({
6677
6714
  type: "image/webp"
6678
6715
  }
6679
6716
  ),
6680
- mobileImage1x && /* @__PURE__ */ jsx(
6717
+ !!mobileImage1x && /* @__PURE__ */ jsx(
6681
6718
  "source",
6682
6719
  {
6683
6720
  srcSet: `${mobileImage1x} 1x${mobileImage2x ? `, ${mobileImage2x} 2x` : ""}`,
@@ -6685,14 +6722,14 @@ const BasePicture = ({
6685
6722
  type
6686
6723
  }
6687
6724
  ),
6688
- image1xAvif && /* @__PURE__ */ jsx(
6725
+ !!image1xAvif && /* @__PURE__ */ jsx(
6689
6726
  "source",
6690
6727
  {
6691
6728
  srcSet: `${image1xAvif} 1x${image2xAvif ? `, ${image2xAvif} 2x` : ""}`,
6692
6729
  type: "image/avif"
6693
6730
  }
6694
6731
  ),
6695
- image1xWebp && /* @__PURE__ */ jsx(
6732
+ !!image1xWebp && /* @__PURE__ */ jsx(
6696
6733
  "source",
6697
6734
  {
6698
6735
  srcSet: `${image1xWebp} 1x${image2xWebp ? `, ${image2xWebp} 2x` : ""}`,
@@ -13,10 +13,14 @@ export interface IPreparedServerImage {
13
13
  image2x: string;
14
14
  image1xWebp: string;
15
15
  image2xWebp: string;
16
+ image1xAvif: string;
17
+ image2xAvif: string;
16
18
  mobileImage1x?: string;
17
19
  mobileImage2x?: string;
18
20
  mobileImage1xWebp?: string;
19
21
  mobileImage2xWebp?: string;
22
+ mobileImage1xAvif?: string;
23
+ mobileImage2xAvif?: string;
20
24
  altRU?: string;
21
25
  altEN?: string;
22
26
  type: ImageType;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "denwa-web-shared",
3
3
  "private": false,
4
- "version": "1.0.23",
4
+ "version": "1.0.24",
5
5
  "type": "module",
6
6
  "author": "Denwa",
7
7
  "main": "dist/denwa-web-shared.cjs.js",