@redneckz/wildless-cms-uni-blocks 0.9.10 → 0.9.12

package/mobile/lib/components/Filtration/FiltrationContent.d.ts

@@ -1,4 +1,5 @@
 import type { ButtonVersion } from '../../model/ButtonVersion';
+import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
 /**
  * @title Заголовок
  */
@@ -28,6 +29,7 @@ export declare type StringArray = {
      * @hidden
      */
     type?: 'array';
+    /** @title */
     items?: {
         /**
          * @default string
@@ -40,13 +42,13 @@ export declare type StringArray = {
 };
 export declare type FiltrationSchema = {
     /** @title Тип недвижимости */
-    propertyType?: StringEnum;
+    propertyType?: StringArray;
     /** @title Этап строительства */
-    stage?: StringEnum;
+    stage?: StringArray;
     /** @title Категории */
-    categories?: StringEnum;
+    categories?: StringArray;
     /** @title Дополнительно */
-    extraOptions?: StringEnum;
+    extraOptions?: StringArray;
 };
 /**
  * @title Кнопка сброса
@@ -59,13 +61,22 @@ export declare type ResetButton = {
     /**
      * @title Цвет кнопки
      */
-    buttonVersion: ButtonVersion;
+    version: ButtonVersion;
 };
+/**
+ * @title Плитка "Не найдено"
+ */
+export declare type NotFound = TitleProps & DescriptionProps;
 export interface FiltrationInnerContent {
-    /** @title Название кнопки */
+    /** @title Название сворачивающейся кнопки */
     label?: string;
-    /** @title Количество отображаемых предметов */
+    /**
+     * @title Количество отображаемых предметов
+     * @minimum 1
+     */
     topItemsCount?: number;
+    resetButton?: ResetButton;
+    notFound?: NotFound;
 }
 /**
  * @title Фильтрация
@@ -73,6 +84,5 @@ export interface FiltrationInnerContent {
 export interface FiltrationContent extends FiltrationInnerContent {
     /** @title Параметры фильтрации */
     filtrationSchema?: FiltrationSchema;
-    resetButton?: ResetButton;
 }
 export {};

package/mobile/lib/components/Filtration/FiltrationInner.js

@@ -4,18 +4,22 @@ import { renderBlocksList } from '../../BlockRenderer/renderBlockList.js';
 import { DefaultFoldButton } from '../../ui-kit/Foldable/DefaultFoldButton.js';
 import { Foldable } from '../../ui-kit/Foldable/Foldable.js';
 import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection.js';
+import { Paragraph } from '../../ui-kit/Paragraph/Paragraph.js';
+import { Text } from '../../ui-kit/Text/Text.js';
 import { style } from '../../utils/style.js';
-import { ErrorBlock } from '../ErrorBlock/ErrorBlock.js';
 import { checkShouldRenderBlock } from './checkShouldRenderBlock.js';
 const ICONS = ['ArrowDownIcon', 'ArrowUpIcon'];
 const resultsGridStyle = 'grid grid-cols-12 gap-1 border-box';
-export const FiltrationInner = JSX(({ label = '', filtrationState = {}, topItemsCount = 0, block, ...rest }) => {
+export const FiltrationInner = JSX(({ label = '', filtrationState = {}, topItemsCount = 0, block, notFound, ...rest }) => {
     const blocksToRender = block?.blocks?.filter((b) => checkShouldRenderBlock(filtrationState, b.content || {})) || [];
     const [visibleBlocks, hiddenBlocks] = topItemsCount > 0
         ? [blocksToRender.slice(0, topItemsCount), blocksToRender.slice(topItemsCount)]
         : [blocksToRender, []];
-    return (_jsxs("div", { children: [_jsx("div", { className: style(blocksToRender.length ? 'hidden' : ''), children: _jsx(ErrorBlock, { error: { errorContentType: 'Image' }, title: "\u041D\u0435\u0442 \u043F\u043E\u0434\u0445\u043E\u0434\u044F\u0449\u0435\u0439 \u0438\u043F\u043E\u0442\u0435\u0447\u043D\u043E\u0439 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B", subtitle: "\u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0444\u0438\u043B\u044C\u0442\u0440\u044B" }) }), _jsxs("div", { className: style(blocksToRender.length ? '' : 'hidden'), children: [_jsx("div", { className: resultsGridStyle, children: renderBlocksList(visibleBlocks, { ...rest.options, parent: block }) }), _jsx(Foldable, { renderFoldableSection: ({ isUnfolded }) => {
-                            return (_jsx(FoldableSection, { className: resultsGridStyle, isUnfolded: isUnfolded, children: renderBlocksList(hiddenBlocks, { ...rest.options, parent: block }) }));
-                        }, renderFoldButton: ({ isUnfolded, onToggle }) => (_jsx(DefaultFoldButton, { className: style('mt-11', topItemsCount < 1 ? 'hidden' : ''), disabled: !hiddenBlocks?.length, label: label, icon: ICONS[Number(isUnfolded)], dataTheme: rest.options?.page?.colorPalette, onClick: onToggle })) })] })] }));
+    return (_jsxs("div", { children: [_jsx("div", { className: style(blocksToRender.length ? 'hidden' : 'block'), children: notFound ? renderNotFound(notFound) : null }), _jsxs("div", { className: style(blocksToRender.length ? '' : 'hidden'), children: [_jsx("div", { className: style('mb-1', resultsGridStyle), children: renderBlocksList(visibleBlocks, { ...rest.options, parent: block }) }), _jsx(Foldable, { renderFoldableSection: ({ isUnfolded }) => {
+                            return (_jsx(FoldableSection, { className: style(resultsGridStyle, isUnfolded ? 'mb-1' : ''), isUnfolded: isUnfolded, children: renderBlocksList(hiddenBlocks, { ...rest.options, parent: block }) }));
+                        }, renderFoldButton: ({ isUnfolded, onToggle }) => (_jsx(DefaultFoldButton, { className: style(topItemsCount < 1 ? 'hidden' : ''), disabled: !hiddenBlocks?.length, label: label, icon: ICONS[Number(isUnfolded)], dataTheme: rest.options?.page?.colorPalette, onClick: onToggle })) })] })] }));
 });
+function renderNotFound({ title, description }) {
+    return (_jsxs("div", { className: "bg-white py-20", children: [title ? (_jsx("div", { className: "mb-2", children: _jsx(Paragraph, { align: "text-center", children: _jsx(Text, { size: "text-h4", children: title }) }) })) : null, description ? (_jsx(Paragraph, { size: "text-xl", font: "font-light", align: "text-center", children: description })) : null] }));
+}
 //# sourceMappingURL=FiltrationInner.js.map

package/mobile/lib/components/Filtration/FiltrationInner.js.map

@@ -1 +1 @@
-{"version":3,"file":"FiltrationInner.js","sourceRoot":"","sources":["../../../src/components/Filtration/FiltrationInner.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"FiltrationInner.js","sourceRoot":"","sources":["../../../src/components/Filtration/FiltrationInner.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/components/Filtration/renderFormItem.js

@@ -5,14 +5,15 @@ export const renderFormItem = (filtrationSchema, register) => (key) => {
     const item = filtrationSchema[key];
     const type = item?.type;
     switch (type) {
-        case 'string':
-            return renderRadioButtons(key, register)(item);
+        case 'array':
+            return renderCheckboxes(key, register)(item);
         default:
             return null;
     }
 };
-const renderRadioButtons = (key, register) => (item) => {
-    const options = item?.enum?.map((e, i) => ({ value: e, title: item?.enumNames?.[i] || '' })) || [];
-    return (_jsxs("div", { role: "radiogroup", children: [item?.title ? (_jsx("div", { className: "mb-4", children: _jsx(Text, { size: "text-m", font: "font-light", color: "text-secondary-text", children: item.title }) })) : null, _jsx(SlideCheckboxGroup, { items: options, multiple: false, ...register(key) })] }, key));
+const renderCheckboxes = (key, register) => (item) => {
+    const options = item?.items?.enum?.map((e, i) => ({ value: e, title: item?.items?.enumNames?.[i] || '' })) ||
+        [];
+    return (_jsxs("div", { children: [item?.title ? (_jsx("div", { className: "mb-4", children: _jsx(Text, { size: "text-m", font: "font-light", color: "text-secondary-text", children: item.title }) })) : null, _jsx(SlideCheckboxGroup, { items: options, multiple: true, ...register(key) })] }, key));
 };
 //# sourceMappingURL=renderFormItem.js.map

package/mobile/lib/components/Filtration/renderFormItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderFormItem.js","sourceRoot":"","sources":["../../../src/components/Filtration/renderFormItem.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AACxF,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,MAAM,CAAC,MAAM,cAAc,GACzB,CAAC,gBAAkC,EAAE,QAA+B,EAAE,EAAE,CAAC,CAAC,GAAW,EAAE,EAAE;IACvF,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAoC,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,CAAC;IAExB,QAAQ,IAAI,EAAE;QACZ,KAAK,QAAQ;YACX,OAAO,kBAAkB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;QACjD;YACE,OAAO,IAAI,CAAC;KACf;AACH,CAAC,CAAC;AAEJ,MAAM,kBAAkB,GACtB,CAAC,GAAW,EAAE,QAA+B,EAAE,EAAE,CAAC,CAAC,IAAiB,EAAE,EAAE;IACtE,MAAM,OAAO,GACX,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAErF,OAAO,CACL,eAAK,IAAI,EAAC,YAAY,aACnB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CACb,cAAK,SAAS,EAAC,MAAM,YACnB,KAAC,IAAI,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,YAAY,EAAC,KAAK,EAAC,qBAAqB,YAC9D,IAAI,CAAC,KAAK,GACN,GACH,CACP,CAAC,CAAC,CAAC,IAAI,EACR,KAAC,kBAAkB,IAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,KAAM,QAAQ,CAAC,GAAG,CAAC,GAAI,KARhD,GAAG,CASzB,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"renderFormItem.js","sourceRoot":"","sources":["../../../src/components/Filtration/renderFormItem.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AACxF,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,MAAM,CAAC,MAAM,cAAc,GACzB,CAAC,gBAAkC,EAAE,QAA+B,EAAE,EAAE,CAAC,CAAC,GAAW,EAAE,EAAE;IACvF,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAoC,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,CAAC;IAExB,QAAQ,IAAI,EAAE;QACZ,KAAK,OAAO;YACV,OAAO,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/C;YACE,OAAO,IAAI,CAAC;KACf;AACH,CAAC,CAAC;AAEJ,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,QAA+B,EAAE,EAAE,CAAC,CAAC,IAAkB,EAAE,EAAE;IAChG,MAAM,OAAO,GACX,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1F,EAAE,CAAC;IAEL,OAAO,CACL,0BACG,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CACb,cAAK,SAAS,EAAC,MAAM,YACnB,KAAC,IAAI,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,YAAY,EAAC,KAAK,EAAC,qBAAqB,YAC9D,IAAI,CAAC,KAAK,GACN,GACH,CACP,CAAC,CAAC,CAAC,IAAI,EACR,KAAC,kBAAkB,IAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,WAAK,QAAQ,CAAC,GAAG,CAAC,GAAI,KAR1D,GAAG,CASP,CACP,CAAC;AACJ,CAAC,CAAC"}

package/mobile/lib/components/Footer/MediaButton.d.ts

@@ -1,8 +1,7 @@
-import type { IconVersion } from '../../model/IconVersion';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { IconProps } from '../../model/Picture';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 export declare type ButtonSize = 'default' | 'small';
-interface MediaButtonProps extends ButtonWithIconProps {
-    iconVersion?: IconVersion;
+interface MediaButtonProps extends ButtonProps, IconProps {
     buttonSize?: ButtonSize;
 }
 export declare const MediaButton: import("@redneckz/uni-jsx").UNIComponent<MediaButtonProps, any, any>;

package/mobile/lib/components/Footer/MediaButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"MediaButton.js","sourceRoot":"","sources":["../../../src/components/Footer/MediaButton.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MediaButton.js","sourceRoot":"","sources":["../../../src/components/Footer/MediaButton.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/content-page-repository/ContentPageRepository.d.ts

@@ -3,12 +3,8 @@ import type { TransformationOptions } from './TransformationOptions';
 export declare class ContentPageRepository {
     private readonly options;
     static readonly inst: ContentPageRepository;
-    private cache;
     constructor(options?: TransformationOptions);
     listAllContentPages(): Promise<string[]>;
-    getAllContentPages(): Promise<ContentPageDef[]>;
-    getSecondaryContentPages(customPageType?: string): Promise<ContentPageDef[]>;
-    getContentPageBySlug(slug: string): Promise<ContentPageDef | undefined>;
-    getIndexPage(): Promise<ContentPageDef | undefined>;
     readPage(filePath: string): Promise<ContentPageDef>;
+    generatePage(filePath: string): Promise<ContentPageDef>;
 }

package/mobile/lib/content-page-repository/ContentPageRepository.js

@@ -1,44 +1,26 @@
+import fs from 'fs';
 import glob from 'glob';
 import util from 'util';
-import { transformContentPage } from './transformContentPage.js';
-const INDEX_PAGE_SLUG = 'index';
+import { generatedPagePath, transformContentPage } from './transformContentPage.js';
 const find = util.promisify(glob);
-const bySlug = (slug) => (content) => content.slug === slug;
-const byCustomPageType = (type) => (content) => type ? content._customPageType === type : !content._customPageType;
-const not = (predicate) => (_) => !predicate(_);
+const readFile = util.promisify(fs.readFile);
 export class ContentPageRepository {
     options;
     static inst = new ContentPageRepository();
-    cache = {};
     constructor(options = {
         contentDir: 'content',
         publicDir: 'public',
     }) {
         this.options = options;
     }
-    async listAllContentPages() {
+    listAllContentPages() {
         return find(`${this.options.contentDir}/**/*.page.json`);
     }
-    async getAllContentPages() {
-        const pagePaths = await this.listAllContentPages();
-        return Promise.all(pagePaths.map((_) => this.readPage(_)));
-    }
-    async getSecondaryContentPages(customPageType) {
-        const pages = await this.getAllContentPages();
-        return pages.filter(not(bySlug(INDEX_PAGE_SLUG))).filter(byCustomPageType(customPageType));
-    }
-    async getContentPageBySlug(slug) {
-        const pages = await this.getAllContentPages();
-        return pages.find(bySlug(slug));
-    }
-    async getIndexPage() {
-        return this.getContentPageBySlug(INDEX_PAGE_SLUG);
-    }
     async readPage(filePath) {
-        if (!(filePath in this.cache)) {
-            this.cache[filePath] = await transformContentPage(filePath, this.options);
-        }
-        return this.cache[filePath];
+        return JSON.parse(await readFile(generatedPagePath(filePath), 'utf-8'));
+    }
+    generatePage(filePath) {
+        return transformContentPage(filePath, this.options);
     }
 }
 //# sourceMappingURL=ContentPageRepository.js.map

package/mobile/lib/content-page-repository/ContentPageRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentPageRepository.js","sourceRoot":"","sources":["../../src/content-page-repository/ContentPageRepository.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,eAAe,GAAG,OAAO,CAAC;AAChC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,OAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC;AACpF,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,OAAuB,EAAE,EAAE,CACtE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;AAErE,MAAM,GAAG,GACP,CAAM,SAA8B,EAAE,EAAE,CACxC,CAAC,CAAM,EAAE,EAAE,CACT,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAElB,MAAM,OAAO,qBAAqB;IAMb;IALZ,MAAM,CAAU,IAAI,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAElD,KAAK,GAAmC,EAAE,CAAC;IAEnD,YACmB,UAAiC;QAChD,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,QAAQ;KACpB;QAHgB,YAAO,GAAP,OAAO,CAGvB;IACA,CAAC;IAEJ,KAAK,CAAC,mBAAmB;QACvB,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAEnD,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,cAAuB;QACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE9C,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC;IAC7F,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAY;QACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE9C,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAC7B,IAAI,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE;YAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3E;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC"}
+{"version":3,"file":"ContentPageRepository.js","sourceRoot":"","sources":["../../src/content-page-repository/ContentPageRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEjF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;AAE7C,MAAM,OAAO,qBAAqB;IAIb;IAHZ,MAAM,CAAU,IAAI,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAE1D,YACmB,UAAiC;QAChD,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,QAAQ;KACpB;QAHgB,YAAO,GAAP,OAAO,CAGvB;IACA,CAAC;IAEJ,mBAAmB;QACjB,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,YAAY,CAAC,QAAgB;QAC3B,OAAO,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC"}

package/mobile/lib/content-page-repository/alignImg.d.ts

@@ -0,0 +1,9 @@
+import type { Sharp } from 'sharp';
+import type { ImageSize } from '../model/ImageSize';
+import type { ImgAlignment } from '../model/Picture';
+interface ImgAlignmentParams {
+    containerSize?: Partial<ImageSize>;
+    alignment?: ImgAlignment;
+}
+export declare const alignImg: ({ containerSize, alignment }: ImgAlignmentParams) => (chain: Sharp) => Promise<Sharp>;
+export {};

package/mobile/lib/content-page-repository/alignImg.js

@@ -0,0 +1,17 @@
+import sharp from 'sharp';
+export const alignImg = ({ containerSize, alignment }) => async (chain) => containerSize?.width && containerSize?.height && alignment
+    ? createTransparentBack(containerSize).composite([
+        {
+            input: await toBuffer(chain),
+            gravity: alignment,
+        },
+    ])
+    : chain;
+const toBuffer = async (chain) => (await chain.toBuffer({ resolveWithObject: true })).data;
+function createTransparentBack({ width, height }) {
+    const channels = 4;
+    const rgbaColor = 0x00000000;
+    const canvas = Buffer.alloc(width * height * channels, rgbaColor);
+    return sharp(canvas, { raw: { width, height, channels } });
+}
+//# sourceMappingURL=alignImg.js.map

package/mobile/lib/content-page-repository/alignImg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"alignImg.js","sourceRoot":"","sources":["../../src/content-page-repository/alignImg.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,MAAM,CAAC,MAAM,QAAQ,GACnB,CAAC,EAAE,aAAa,EAAE,SAAS,EAAsB,EAAE,EAAE,CACrD,KAAK,EAAE,KAAY,EAAkB,EAAE,CACrC,aAAa,EAAE,KAAK,IAAI,aAAa,EAAE,MAAM,IAAI,SAAS;IACxD,CAAC,CAAC,qBAAqB,CAAC,aAA0B,CAAC,CAAC,SAAS,CAAC;QAC1D;YACE,KAAK,EAAE,MAAM,QAAQ,CAAC,KAAK,CAAC;YAC5B,OAAO,EAAE,SAAS;SACnB;KACF,CAAC;IACJ,CAAC,CAAC,KAAK,CAAC;AAEd,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAElG,SAAS,qBAAqB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAa;IACzD,MAAM,QAAQ,GAAG,CAAC,CAAC;IACnB,MAAM,SAAS,GAAG,UAAU,CAAC;IAE7B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,GAAG,QAAQ,EAAE,SAAS,CAAC,CAAC;IAElE,OAAO,KAAK,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAC7D,CAAC"}

package/mobile/lib/content-page-repository/computeImgOutputPath.d.ts

@@ -0,0 +1,3 @@
+import type { ImgSource } from '../model/Picture';
+import type { TransformationOptions } from './TransformationOptions';
+export declare function computeImgOutputPath(imgInputPath: string, { contentDir, publicDir, format, size, alignment }: TransformationOptions & ImgSource): string;

package/mobile/lib/content-page-repository/computeImgOutputPath.js

@@ -0,0 +1,12 @@
+import path from 'path';
+export function computeImgOutputPath(imgInputPath, { contentDir, publicDir, format, size, alignment }) {
+    const imgRelativePath = path.relative(contentDir, imgInputPath);
+    const imgDir = path.dirname(imgRelativePath);
+    const inputExt = path.extname(imgRelativePath);
+    const fileName = path.basename(imgRelativePath, inputExt);
+    const suffixParts = [size?.width, size?.height, alignment].filter(Boolean);
+    const suffix = suffixParts.length ? `-${suffixParts.join('-')}` : '';
+    const ext = format ? `.${format}` : inputExt;
+    return path.join(publicDir, imgDir, `${fileName}${suffix}${ext}`);
+}
+//# sourceMappingURL=computeImgOutputPath.js.map

package/mobile/lib/content-page-repository/computeImgOutputPath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeImgOutputPath.js","sourceRoot":"","sources":["../../src/content-page-repository/computeImgOutputPath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,MAAM,UAAU,oBAAoB,CAClC,YAAoB,EACpB,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAqC;IAErF,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAEhE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAE7C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACrE,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IAE7C,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,QAAQ,GAAG,MAAM,GAAG,GAAG,EAAE,CAAC,CAAC;AACpE,CAAC"}

package/mobile/lib/content-page-repository/resizeImg.d.ts

@@ -0,0 +1,3 @@
+import type { ResizeOptions, Sharp } from 'sharp';
+import type { ImageSize } from '../model/ImageSize';
+export declare const resizeImg: (size?: Partial<ImageSize>, options?: ResizeOptions) => (chain: Sharp) => Sharp;

package/mobile/lib/content-page-repository/resizeImg.js

@@ -0,0 +1,13 @@
+import sharp from 'sharp';
+export const resizeImg = (size, options) => (chain) => size
+    ? chain.resize(size.width || null, size.height || null, {
+        /*
+         * Editor behaviour with one dimension present: resize by given dimension maintaining aspect ratio. (fit: contain)
+         * With two dimensions present: resize trying to fill given dimensions (fit: fill)
+         */
+        fit: size.width && size.height ? sharp.fit.fill : sharp.fit.contain,
+        background: { r: 0, g: 0, b: 0, alpha: 0 },
+        ...options,
+    })
+    : chain;
+//# sourceMappingURL=resizeImg.js.map

package/mobile/lib/content-page-repository/resizeImg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resizeImg.js","sourceRoot":"","sources":["../../src/content-page-repository/resizeImg.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,MAAM,CAAC,MAAM,SAAS,GACpB,CAAC,IAAyB,EAAE,OAAuB,EAAE,EAAE,CACvD,CAAC,KAAY,EAAS,EAAE,CACtB,IAAI;IACF,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE;QACpD;;;WAGG;QACH,GAAG,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO;QACnE,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;QAC1C,GAAG,OAAO;KACX,CAAC;IACJ,CAAC,CAAC,KAAK,CAAC"}

package/mobile/lib/content-page-repository/transformContentPage.d.ts

@@ -1,3 +1,4 @@
 import type { ContentPageDef } from '../model/ContentPageDef';
 import type { TransformationOptions } from './TransformationOptions';
 export declare function transformContentPage(pagePath: string, options: TransformationOptions): Promise<ContentPageDef>;
+export declare const generatedPagePath: (pagePath: string) => string;

package/mobile/lib/content-page-repository/transformContentPage.js

@@ -5,32 +5,37 @@ import { transformHTML } from './transformHTML.js';
 import { transformMarkdown } from './transformMarkdown.js';
 import { transformPicture } from './transformPicture.js';
 const readFile = util.promisify(fs.readFile);
+const writeFile = util.promisify(fs.writeFile);
+const OUTPUT_SUFFIX = '.static';
 export async function transformContentPage(pagePath, options) {
     const content = await readFile(pagePath, 'utf8');
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    return mapJSON(JSON.parse(content), async (value, [key]) => {
-        const isMarkdown = typeof value === 'string' && key?.endsWith('__md');
-        const isHTML = typeof value === 'string' && key?.endsWith('__html');
-        if (isMarkdown) {
-            return await transformMarkdown(value);
-        }
-        else if (isHTML) {
-            return await transformHTML(value);
-        }
-        else if (isPicture(value)) {
-            try {
-                return await transformPicture(pagePath, value, options);
+    const result = await mapJSON(JSON.parse(content), async (value, [key]) => {
+        const isMarkdown = isString(value) && key?.endsWith('__md');
+        const isHTML = isString(value) && key?.endsWith('__html');
+        try {
+            if (isMarkdown) {
+                return await transformMarkdown(value);
             }
-            catch (ex) {
-                console.warn('Error while transforming picture on page: %s', pagePath);
-                console.error(ex);
+            else if (isHTML) {
+                return await transformHTML(value);
             }
+            else if (isPicture(value)) {
+                return await transformPicture(value, pagePath, options);
+            }
+        }
+        catch (ex) {
+            console.warn(`Error while transforming field "${key}" on page: ${pagePath}`);
+            console.error(ex);
         }
         return value;
     });
+    await writeFile(generatedPagePath(pagePath), JSON.stringify(result), 'utf-8');
+    return result;
 }
-const isLocalPath = (_) => isString(_) && _.length < 512 && !isURL(_);
-const isString = (_) => Boolean(_ && typeof _ === 'string');
-const isURL = (src) => ['data:', 'https:', 'http:'].some((proto) => src.startsWith(proto));
+export const generatedPagePath = (pagePath) => `${pagePath}${OUTPUT_SUFFIX}`;
 const isPicture = (_) => Boolean(_ && isLocalPath(_?.src));
+const isLocalPath = (_) => isString(_) && _.length < 1024 && !isURL(_);
+const isURL = (src) => ['data:', 'https:', 'http:'].some((proto) => src.startsWith(proto));
+const isString = (_) => Boolean(_ && typeof _ === 'string');
 //# sourceMappingURL=transformContentPage.js.map

package/mobile/lib/content-page-repository/transformContentPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformContentPage.js","sourceRoot":"","sources":["../../src/content-page-repository/transformContentPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,OAA8B;IAE9B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEjD,iEAAiE;IACjE,OAAO,OAAO,CAAiB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAU,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE;QAC9E,MAAM,UAAU,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEpE,IAAI,UAAU,EAAE;YACd,OAAO,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;SACvC;aAAM,IAAI,MAAM,EAAE;YACjB,OAAO,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;SACnC;aAAM,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE;YAC3B,IAAI;gBACF,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;aACzD;YAAC,OAAO,EAAE,EAAE;gBACX,OAAO,CAAC,IAAI,CAAC,8CAA8C,EAAE,QAAQ,CAAC,CAAC;gBACvE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aACnB;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,WAAW,GAAG,CAAC,CAAM,EAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEpF,MAAM,QAAQ,GAAG,CAAC,CAAM,EAAe,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC;AAE9E,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;AAEnG,MAAM,SAAS,GAAG,CAAC,CAAM,EAAgB,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC"}
+{"version":3,"file":"transformContentPage.js","sourceRoot":"","sources":["../../src/content-page-repository/transformContentPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;AAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;AAE/C,MAAM,aAAa,GAAG,SAAS,CAAC;AAEhC,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,OAA8B;IAE9B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEjD,iEAAiE;IACjE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAiB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAU,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE;QAC5F,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE1D,IAAI;YACF,IAAI,UAAU,EAAE;gBACd,OAAO,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;aACvC;iBAAM,IAAI,MAAM,EAAE;gBACjB,OAAO,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;aACnC;iBAAM,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE;gBAC3B,OAAO,MAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;aACzD;SACF;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,CAAC,IAAI,CAAC,mCAAmC,GAAG,cAAc,QAAQ,EAAE,CAAC,CAAC;YAC7E,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SACnB;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAE9E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,GAAG,QAAQ,GAAG,aAAa,EAAE,CAAC;AAErF,MAAM,SAAS,GAAG,CAAC,CAAM,EAAgB,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AAC9E,MAAM,WAAW,GAAG,CAAC,CAAM,EAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACrF,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;AAEnG,MAAM,QAAQ,GAAG,CAAC,CAAM,EAAe,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC"}

package/mobile/lib/content-page-repository/transformImg.d.ts

@@ -1,11 +1,12 @@
 import type { ImageSize } from '../model/ImageSize';
 import type { ImgSource } from '../model/Picture';
 import type { TransformationOptions } from './TransformationOptions';
-declare type TransformImgParams = {
-    pagePath: string;
-    src: string;
+declare type ImgOutputPath = string;
+declare type TransformationTaskKey = ImgOutputPath;
+declare type TransformationTasksCache = Map<TransformationTaskKey, Promise<ImgOutputPath>>;
+declare type TransformImgOptions = TransformationOptions & ImgSource & {
     containerSize?: ImageSize;
-    transformationOptions: TransformationOptions & ImgSource;
+    cache?: TransformationTasksCache;
 };
-export declare function transformImg({ pagePath, src, containerSize, transformationOptions, }: TransformImgParams): Promise<string>;
+export declare function transformImg(src: string, pagePath: string, options: TransformImgOptions): ImgOutputPath | Promise<ImgOutputPath>;
 export {};

package/mobile/lib/content-page-repository/transformImg.js

@@ -3,86 +3,36 @@ import path from 'path';
 import sharp from 'sharp';
 import util from 'util';
 import { isPictureSizeEmpty } from '../utils/isPictureSizeEmpty.js';
-import { transformImgPath } from './transformImgPath.js';
+import { alignImg } from './alignImg.js';
+import { computeImgOutputPath } from './computeImgOutputPath.js';
+import { resizeImg } from './resizeImg.js';
 const mkdir = util.promisify(fs.mkdir);
-export async function transformImg({ pagePath, src, containerSize, transformationOptions, }) {
+const defaultTransformationCache = new Map();
+export function transformImg(src, pagePath, options) {
     if (!src) {
         return '';
     }
-    const { contentDir, publicDir, format, options, size, alignment } = transformationOptions;
-    const pageDir = path.dirname(pagePath);
-    const imgPath = `${pageDir}/${src}`;
-    let chain = sharp(imgPath);
-    const targetSize = getPictureSize(size, containerSize);
-    if (targetSize) {
-        chain = resizeImg(chain, targetSize, getResizeFit(targetSize));
+    const input = path.join(path.dirname(pagePath), src);
+    const output = computeImgOutputPath(input, options);
+    const { cache = defaultTransformationCache } = options;
+    const cachedResult = cache.get(output);
+    if (cachedResult) {
+        return cachedResult;
     }
-    if (containerSize) {
-        chain = resizeImg(chain, containerSize);
-        // Save intermediate transform result to modify further
-        const { data } = await chain.toBuffer({ resolveWithObject: true });
-        chain = resizeImg(sharp(data), getCompositionResizeSize(containerSize, targetSize), getResizeFit(targetSize));
-        chain = await compositeImg({ chain, containerSize, alignment });
-    }
-    if (format) {
-        chain = chain.toFormat(format, options);
-    }
-    const transformedImgPath = transformImgPath(src, { pageDir, contentDir }, transformationOptions);
-    const imgPublicPath = path.join(publicDir, transformedImgPath);
-    await mkdir(path.dirname(imgPublicPath), { recursive: true });
-    try {
-        await chain.toFile(imgPublicPath);
-    }
-    catch (e) {
-        console.error(e);
-    }
-    return transformedImgPath;
-}
-function createBackgroundImageChain({ width, height }) {
-    const channels = 4;
-    const rgbaColor = 0x00000000;
-    const canvas = Buffer.alloc(width * height * channels, rgbaColor);
-    return sharp(canvas, { raw: { width, height, channels } });
-}
-function resizeImg(chain, size, options) {
-    return chain.resize(size?.width || null, size?.height || null, {
-        fit: sharp.fit.fill,
-        background: { r: 0, g: 0, b: 0, alpha: 0 },
-        ...options,
-    });
-}
-async function compositeImg({ chain, containerSize, alignment, }) {
-    const { data } = await chain.toBuffer({ resolveWithObject: true });
-    return createBackgroundImageChain(containerSize).composite([
-        {
-            input: data,
-            gravity: alignment,
-        },
-    ]);
-}
-function getPictureSize(size, containerSize) {
-    // If containerSize is undefined intrinsic dimensions of image will be used then.
-    return isPictureSizeEmpty(size) ? containerSize : size;
-}
-function getCompositionResizeSize(containerSize, size = {}) {
-    const { width, height } = size;
-    const { width: containerWidth, height: containerHeight } = containerSize;
-    if (!(width || height)) {
-        return undefined;
-    }
-    const widthRatio = width ? containerWidth / width : 0;
-    const heightRatio = height ? containerHeight / height : 0;
-    return widthRatio > heightRatio
-        ? { width: Math.min(Number(width), containerWidth) }
-        : { height: Math.min(Number(height), containerHeight) };
-}
-function getResizeFit(size) {
-    /*
-      Editor behaviour with one dimension present: resize by given dimension maintaining aspect ratio. (fit: contain)
-      With two dimensions present: resize trying to fill given dimensions (fit: fill)
-     */
-    return {
-        fit: size?.width && size?.height ? sharp.fit.fill : sharp.fit.contain,
-    };
+    const result = (async () => {
+        try {
+            await mkdir(path.dirname(output), { recursive: true });
+            const chain = await computeTransformationChain(options)(sharp(input));
+            await chain.toFile(output);
+        }
+        catch (e) {
+            console.error(e);
+        }
+        return output;
+    })();
+    cache.set(output, result);
+    return result;
 }
+const computeTransformationChain = ({ size, containerSize, alignment, format, options, }) => pipe(resizeImg(isPictureSizeEmpty(size) ? containerSize : size), alignImg({ containerSize, alignment }), (_) => (format ? _.toFormat(format, options) : _));
+const pipe = (...operations) => operations.reduce((a, b) => async (chain) => b(await a(chain)));
 //# sourceMappingURL=transformImg.js.map

package/mobile/lib/content-page-repository/transformImg.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformImg.js","sourceRoot":"","sources":["../../src/content-page-repository/transformImg.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transformImg.js","sourceRoot":"","sources":["../../src/content-page-repository/transformImg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAqB,MAAM,OAAO,CAAC;AAC1C,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;AASvC,MAAM,0BAA0B,GAA6B,IAAI,GAAG,EAAE,CAAC;AAEvE,MAAM,UAAU,YAAY,CAC1B,GAAW,EACX,QAAgB,EAChB,OAA4B;IAE5B,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,EAAE,CAAC;KACX;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEpD,MAAM,EAAE,KAAK,GAAG,0BAA0B,EAAE,GAAG,OAAO,CAAC;IAEvD,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,YAAY,EAAE;QAChB,OAAO,YAAY,CAAC;KACrB;IAED,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;QACzB,IAAI;YACF,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAEvD,MAAM,KAAK,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YACtE,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAC5B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,EAAE,CAAC;IACL,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE1B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,0BAA0B,GAAG,CAAC,EAClC,IAAI,EACJ,aAAa,EACb,SAAS,EACT,MAAM,EACN,OAAO,GACa,EAAE,EAAE,CACxB,IAAI,CACF,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,EAC1D,QAAQ,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,EACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAClD,CAAC;AAEJ,MAAM,IAAI,GAAG,CAAC,GAAG,UAA2D,EAAE,EAAE,CAC9E,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAY,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC"}

package/mobile/lib/content-page-repository/transformPicture.d.ts

@@ -1,3 +1,3 @@
 import type { Picture } from '../model/Picture';
 import type { TransformationOptions } from './TransformationOptions';
-export declare function transformPicture(pagePath: string, picture: Picture, options: TransformationOptions): Promise<Picture>;
+export declare function transformPicture(picture: Picture, pagePath: string, options: TransformationOptions): Promise<Picture>;

package/mobile/lib/content-page-repository/transformPicture.js

@@ -1,28 +1,20 @@
 import path from 'path';
 import sharp from 'sharp';
 import { transformImg } from './transformImg.js';
-export async function transformPicture(pagePath, picture, options) {
-    const sources = picture.sources || [];
+export async function transformPicture(picture, pagePath, options) {
     const src = picture?.src || '';
-    const transformedPicture = await transformImg({
-        pagePath,
-        src,
-        transformationOptions: { ...options, ...picture },
-    });
-    const { width, height } = await sharp(path.resolve(options.publicDir, transformedPicture)).metadata();
+    const transformedImgPath = await transformImg(src, pagePath, { ...options, ...picture });
+    const { width, height } = await sharp(transformedImgPath).metadata();
     const containerSize = width && height ? { width, height } : undefined;
-    const transformedSources = await Promise.all(sources.map((_) => transformImg({
-        pagePath,
-        src,
-        containerSize,
-        transformationOptions: { ...options, ..._ },
-    })));
+    const sources = picture.sources || [];
+    const transformedSources = await Promise.all(sources.map((_) => transformImg(src, pagePath, { ...options, ..._, containerSize })));
+    const imgPathToSrc = (_) => path.join('/', path.relative(options.publicDir, _));
     return {
         ...picture,
-        src: path.join('/', transformedPicture),
+        src: imgPathToSrc(transformedImgPath),
         sources: transformedSources.map((_, i) => ({
             ...sources[i],
-            src: path.join('/', _),
+            src: imgPathToSrc(_),
             size: { width, height },
         })),
     };