@escapenavigator/utils 2.0.9 → 2.0.11

package/dist/image-url.d.ts

@@ -1,6 +1,7 @@
 export declare const IMAGE_CDN_HOST_COM = "d2z3luly8bezbw.cloudfront.net";
 export declare const IMAGE_CDN_HOST_RU = "picture.escapenavigator.ru";
-export declare const imageResizeSizes: {
+/** @see en-ui/src/image/utils.ts — keep in sync */
+export declare const imageSizes: {
     readonly xs: "300x300";
     readonly s: "300x300";
     readonly m: "300x300";
@@ -9,10 +10,24 @@ export declare const imageResizeSizes: {
     readonly xxl: "640x640";
     readonly auto: "640x640";
 };
-export type ImageResizeSize = keyof typeof imageResizeSizes | (string & {});
+export type ImageResizeSize = keyof typeof imageSizes | (string & {});
 export declare const GALLERY_IMAGE_SIZE = "1280x1280";
+/** Default CDN resize box when size is omitted. */
+export declare const DEFAULT_IMAGE_DIMENSIONS = "300x300";
+export declare const isRuImageRegion: () => boolean;
 export declare const getImageCdnHost: () => string;
 export declare const extractStoragePath: (src: string) => string | null;
 export declare const isEscapenavigatorImage: (src: string) => boolean;
-/** @see en-ui/src/image/utils.ts — keep logic in sync */
+export declare const resolveImageDimensions: (size?: ImageResizeSize) => string;
+/** @see en-ui getImageSrc — same logic, for raw `<img>` outside @alphakits/ui Image */
 export declare const getImageUrl: (src?: string, size?: ImageResizeSize) => string | undefined;
+/** @deprecated use imageSizes */
+export declare const imageResizeSizes: {
+    readonly xs: "300x300";
+    readonly s: "300x300";
+    readonly m: "300x300";
+    readonly l: "300x300";
+    readonly xl: "300x300";
+    readonly xxl: "640x640";
+    readonly auto: "640x640";
+};

package/dist/image-url.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getImageUrl = exports.isEscapenavigatorImage = exports.extractStoragePath = exports.getImageCdnHost = exports.GALLERY_IMAGE_SIZE = exports.imageResizeSizes = exports.IMAGE_CDN_HOST_RU = exports.IMAGE_CDN_HOST_COM = void 0;
-const is_ru_1 = require("./is-ru");
+exports.imageResizeSizes = exports.getImageUrl = exports.resolveImageDimensions = exports.isEscapenavigatorImage = exports.extractStoragePath = exports.getImageCdnHost = exports.isRuImageRegion = exports.DEFAULT_IMAGE_DIMENSIONS = exports.GALLERY_IMAGE_SIZE = exports.imageSizes = exports.IMAGE_CDN_HOST_RU = exports.IMAGE_CDN_HOST_COM = void 0;
 exports.IMAGE_CDN_HOST_COM = 'd2z3luly8bezbw.cloudfront.net';
 exports.IMAGE_CDN_HOST_RU = 'picture.escapenavigator.ru';
 const S3_BUCKET_MARKER = 'escapenavigator-images.s3';
 const CDN_HOSTS = [exports.IMAGE_CDN_HOST_COM, exports.IMAGE_CDN_HOST_RU];
-exports.imageResizeSizes = {
+/** @see en-ui/src/image/utils.ts — keep in sync */
+exports.imageSizes = {
     xs: '300x300',
     s: '300x300',
     m: '300x300',
@@ -16,25 +16,36 @@ exports.imageResizeSizes = {
     auto: '640x640',
 };
 exports.GALLERY_IMAGE_SIZE = '1280x1280';
-const getImageCdnHost = () => ((0, is_ru_1.isRu)() ? exports.IMAGE_CDN_HOST_RU : exports.IMAGE_CDN_HOST_COM);
+/** Default CDN resize box when size is omitted. */
+exports.DEFAULT_IMAGE_DIMENSIONS = '300x300';
+const isRuImageRegion = () => process.env.REACT_APP_REGION === 'ru';
+exports.isRuImageRegion = isRuImageRegion;
+const getImageCdnHost = () => (0, exports.isRuImageRegion)() ? exports.IMAGE_CDN_HOST_RU : exports.IMAGE_CDN_HOST_COM;
 exports.getImageCdnHost = getImageCdnHost;
 const extractStoragePath = (src) => {
     if (src.includes('amazonaws.com/')) {
         return src.split('amazonaws.com/')[1]?.split('?')[0] ?? null;
     }
-    const match = src.match(/fit-in\/\d+x\d+\/(.+?)(?:\?|$)/);
+    const match = src.match(/fit-in\/[^/]+\/(.+?)(?:\?|$)/);
     return match?.[1] ?? null;
 };
 exports.extractStoragePath = extractStoragePath;
 const isEscapenavigatorImage = (src) => src.includes(S3_BUCKET_MARKER) || CDN_HOSTS.some((host) => src.includes(host));
 exports.isEscapenavigatorImage = isEscapenavigatorImage;
-/** @see en-ui/src/image/utils.ts — keep logic in sync */
-const getImageUrl = (src, size = 'm') => {
+const resolveImageDimensions = (size) => {
+    if (!size)
+        return exports.DEFAULT_IMAGE_DIMENSIONS;
+    if (size in exports.imageSizes) {
+        return exports.imageSizes[size];
+    }
+    return size;
+};
+exports.resolveImageDimensions = resolveImageDimensions;
+/** @see en-ui getImageSrc — same logic, for raw `<img>` outside @alphakits/ui Image */
+const getImageUrl = (src, size) => {
     if (!src || src.startsWith('data:'))
         return src;
-    const dimensions = size in exports.imageResizeSizes
-        ? exports.imageResizeSizes[size]
-        : size;
+    const dimensions = (0, exports.resolveImageDimensions)(size);
     if (!(0, exports.isEscapenavigatorImage)(src))
         return src;
     const path = (0, exports.extractStoragePath)(src);
@@ -43,3 +54,5 @@ const getImageUrl = (src, size = 'm') => {
     return `https://${(0, exports.getImageCdnHost)()}/fit-in/${dimensions}/${path}`;
 };
 exports.getImageUrl = getImageUrl;
+/** @deprecated use imageSizes */
+exports.imageResizeSizes = exports.imageSizes;

package/dist/index.d.ts

@@ -14,6 +14,7 @@ export * from './get-full-name';
 export * from './get-handled-error-message';
 export * from './get-order-cancelation-state';
 export * from './get-service-error';
+export * from './image-url';
 export * from './is-axios-error';
 export * from './is-network-error';
 export * from './is-stale-chunk-error';
@@ -34,4 +35,3 @@ export * from './utm-touchpoints';
 export * from './validate-by-dto';
 export * from './validate-promocode';
 export * from './widget-chat-attention';
-export * from './image-url';

package/dist/index.js

@@ -30,6 +30,7 @@ __exportStar(require("./get-full-name"), exports);
 __exportStar(require("./get-handled-error-message"), exports);
 __exportStar(require("./get-order-cancelation-state"), exports);
 __exportStar(require("./get-service-error"), exports);
+__exportStar(require("./image-url"), exports);
 __exportStar(require("./is-axios-error"), exports);
 __exportStar(require("./is-network-error"), exports);
 __exportStar(require("./is-stale-chunk-error"), exports);
@@ -50,4 +51,3 @@ __exportStar(require("./utm-touchpoints"), exports);
 __exportStar(require("./validate-by-dto"), exports);
 __exportStar(require("./validate-promocode"), exports);
 __exportStar(require("./widget-chat-attention"), exports);
-__exportStar(require("./image-url"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^2.0.9",
+    "@escapenavigator/types": "^2.0.10",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -29,5 +29,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.6"
   },
-  "gitHead": "eb29688633048e8011bc07e280dcaa84a2c61244"
+  "gitHead": "f2969a35bebc2dac1fb8fc3c6b2ec2f6943eb282"
 }