@redneckz/wildless-cms-uni-blocks 0.9.11 → 0.9.13

package/dist/components/Calculator/useDepositCalculatorParams.js

@@ -1,15 +1,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useDepositCalculatorParams = void 0;
+const arrayByRange_1 = require("../../utils/arrayByRange");
+const mergeIntervals_1 = require("../../utils/mergeIntervals");
 const constants_1 = require("./constants");
 const rangeHelpers_1 = require("./rangeHelpers");
 const useCalculatorParams_1 = require("./useCalculatorParams");
-const useDepositCalculatorParams = (userInputParams, sourceBookDir) => {
-    const { isMonthlyInterestPayment, isRemoteRegistration, moneyValue, monthsValue } = userInputParams;
+const useDepositCalculatorParams = (userInputParams, sourceBookDir, paramsViewSettings) => {
+    const { moneyValue, monthsValue } = userInputParams;
     const data = (0, useCalculatorParams_1.useCalculatorParams)(sourceBookDir || constants_1.DEPOSIT_CALC_DEFAULT_DIR);
-    const depositCalculatorSourceBookParams = data?.rows?.find((_) => isMonthlyInterestPayment === _.isMonthlyInterestPayment &&
-        isRemoteRegistration === _.isRemoteRegistration &&
-        (0, rangeHelpers_1.checkRangeByKeys)(moneyValue, ['minSum', 'maxSum'], _) &&
-        (0, rangeHelpers_1.checkRangeByKeys)(monthsValue, ['minMonths', 'maxMonths'], _)) || constants_1.DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
+    const isExcludeMonthlyInterestPayment = !paramsViewSettings?.isShowMonthlyInterestPayment;
+    const isExcludeRemoteRegistration = !paramsViewSettings?.isShowRemoteRegistration;
+    const depositCalculatorSourceBookParams = data?.rows?.find((row) => checkRowByParam({
+        row,
+        userInputParams,
+        paramKey: 'isMonthlyInterestPayment',
+        isExclude: isExcludeMonthlyInterestPayment,
+    }) &&
+        checkRowByParam({
+            row,
+            userInputParams,
+            paramKey: 'isRemoteRegistration',
+            isExclude: isExcludeRemoteRegistration,
+        }) &&
+        (0, rangeHelpers_1.checkRangeByKeys)(moneyValue, ['minSum', 'maxSum'], row) &&
+        (0, rangeHelpers_1.checkRangeByKeys)(monthsValue, ['minMonths', 'maxMonths'], row)) || constants_1.DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
     const { rate } = depositCalculatorSourceBookParams;
     const income = getDepositIncome(rate, userInputParams);
     const finalSum = moneyValue + income;
@@ -18,6 +32,7 @@ const useDepositCalculatorParams = (userInputParams, sourceBookDir) => {
         ...depositCalculatorSourceBookParams,
         ...(0, rangeHelpers_1.getRangeByKeys)(['minSum', 'maxSum'], sourceBookRows),
         ...(0, rangeHelpers_1.getRangeByKeys)(['minMonths', 'maxMonths'], sourceBookRows),
+        availableMonths: (0, mergeIntervals_1.mergeIntervals)(sourceBookRows.map((row) => [row['minMonths'], row['maxMonths']])).flatMap(([start, end]) => (0, arrayByRange_1.arrayByRange)(start, end)),
         ...userInputParams,
         income,
         finalSum,
@@ -36,4 +51,5 @@ const getDepositIncome = (rate, userInputParams) => {
         return Math.round((moneyValue * rate * 30 * monthsValue) / 365 / 100);
     }
 };
+const checkRowByParam = ({ row, userInputParams, paramKey, isExclude }) => isExclude || userInputParams[paramKey] === row[paramKey];
 //# sourceMappingURL=useDepositCalculatorParams.js.map

package/dist/components/Calculator/useDepositCalculatorParams.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDepositCalculatorParams.js","sourceRoot":"","sources":["../../../src/components/Calculator/useDepositCalculatorParams.ts"],"names":[],"mappings":";;AAAA,2CAA0F;AAC1F,iDAAkE;AAClE,+DAA4D;AA+BrD,MAAM,0BAA0B,GAAG,CACxC,eAAiD,EACjD,aAAsB,EACG,EAAE;IAC3B,MAAM,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,UAAU,EAAE,WAAW,EAAE,GAC/E,eAAe,CAAC;IAElB,MAAM,IAAI,GAAG,IAAA,yCAAmB,EAC9B,aAAa,IAAI,oCAAwB,CAC1C,CAAC;IAEF,MAAM,iCAAiC,GACrC,IAAI,EAAE,IAAI,EAAE,IAAI,CACd,CAAC,CAAC,EAAE,EAAE,CACJ,wBAAwB,KAAK,CAAC,CAAC,wBAAwB;QACvD,oBAAoB,KAAK,CAAC,CAAC,oBAAoB;QAC/C,IAAA,+BAAgB,EAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;QACrD,IAAA,+BAAgB,EAAC,WAAW,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CAC/D,IAAI,6CAAiC,CAAC;IAEzC,MAAM,EAAE,IAAI,EAAE,GAAG,iCAAiC,CAAC;IACnD,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAC;IACrC,MAAM,cAAc,GAAG,IAAI,EAAE,IAAI,IAAI,CAAC,6CAAiC,CAAC,CAAC;IAEzE,OAAO;QACL,GAAG,iCAAiC;QACpC,GAAG,IAAA,6BAAc,EAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,cAAc,CAAC;QACvD,GAAG,IAAA,6BAAc,EAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,cAAc,CAAC;QAC7D,GAAG,eAAe;QAClB,MAAM;QACN,QAAQ;KACT,CAAC;AACJ,CAAC,CAAC;AAjCW,QAAA,0BAA0B,8BAiCrC;AAEF,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,eAAiD,EAAE,EAAE;IAC3F,MAAM,EAAE,wBAAwB,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC;IAE9E,IAAI,wBAAwB,EAAE;QAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,WAAW,CAAC,GAAG,UAAU,CAAC,CAAC;KAC1F;SAAM;QACL;;UAEE;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,GAAG,WAAW,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;KACvE;AACH,CAAC,CAAC"}
+{"version":3,"file":"useDepositCalculatorParams.js","sourceRoot":"","sources":["../../../src/components/Calculator/useDepositCalculatorParams.ts"],"names":[],"mappings":"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"}

package/dist/components/CarouselRecommendationCard/CarouselRecommendationCardContent.d.ts

@@ -1,15 +1,11 @@
-import type { ButtonVersion } from '../../model/ButtonVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkCommonProps } from '../../model/LinkProps';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
-export declare type RecommendationSocialMedia = LinkCommonProps & IconProps & ButtonWithIconProps & {
-    version: ButtonVersion;
-    rounded?: boolean;
-};
+export declare type RecommendationSocialMedia = LinkCommonProps & IconProps & ButtonProps;
 /**
  * @title Карточка рекомендаций
  */

package/dist/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/dist/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/dist/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/dist/content-page-repository/ContentPageRepository.js

@@ -3,47 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContentPageRepository = void 0;
+const fs_1 = __importDefault(require("fs"));
 const glob_1 = __importDefault(require("glob"));
 const util_1 = __importDefault(require("util"));
 const transformContentPage_1 = require("./transformContentPage");
-const INDEX_PAGE_SLUG = 'index';
 const find = util_1.default.promisify(glob_1.default);
-const bySlug = (slug) => (content) => content.slug === slug;
-const byCustomPageType = (type) => (content) => type ? content._customPageType === type : !content._customPageType;
-const not = (predicate) => (_) => !predicate(_);
+const readFile = util_1.default.promisify(fs_1.default.readFile);
 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 (0, transformContentPage_1.transformContentPage)(filePath, this.options);
-        }
-        return this.cache[filePath];
+        return JSON.parse(await readFile((0, transformContentPage_1.generatedPagePath)(filePath), 'utf-8'));
+    }
+    generatePage(filePath) {
+        return (0, transformContentPage_1.transformContentPage)(filePath, this.options);
     }
 }
 exports.ContentPageRepository = ContentPageRepository;

package/dist/content-page-repository/ContentPageRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentPageRepository.js","sourceRoot":"","sources":["../../src/content-page-repository/ContentPageRepository.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,gDAAwB;AAGxB,iEAA8D;AAE9D,MAAM,eAAe,GAAG,OAAO,CAAC;AAChC,MAAM,IAAI,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,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,MAAa,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,IAAA,2CAAoB,EAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3E;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;;AA5CH,sDA6CC"}
+{"version":3,"file":"ContentPageRepository.js","sourceRoot":"","sources":["../../src/content-page-repository/ContentPageRepository.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,gDAAwB;AAGxB,iEAAiF;AAEjF,MAAM,IAAI,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,CAAC;AAClC,MAAM,QAAQ,GAAG,cAAI,CAAC,SAAS,CAAC,YAAE,CAAC,QAAQ,CAAC,CAAC;AAE7C,MAAa,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,IAAA,wCAAiB,EAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,YAAY,CAAC,QAAgB;QAC3B,OAAO,IAAA,2CAAoB,EAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;;AApBH,sDAqBC"}

package/dist/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/dist/content-page-repository/alignImg.js

@@ -0,0 +1,23 @@
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.alignImg = void 0;
+const sharp_1 = __importDefault(require("sharp"));
+const alignImg = ({ containerSize, alignment }) => async (chain) => containerSize?.width && containerSize?.height && alignment
+    ? createTransparentBack(containerSize).composite([
+        {
+            input: await toBuffer(chain),
+            gravity: alignment,
+        },
+    ])
+    : chain;
+exports.alignImg = alignImg;
+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 (0, sharp_1.default)(canvas, { raw: { width, height, channels } });
+}
+//# sourceMappingURL=alignImg.js.map

package/dist/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,kDAA0B;AASnB,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;AAVD,QAAA,QAAQ,YAUP;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,IAAA,eAAK,EAAC,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAC7D,CAAC"}

package/dist/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/dist/content-page-repository/computeImgOutputPath.js

@@ -0,0 +1,18 @@
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.computeImgOutputPath = void 0;
+const path_1 = __importDefault(require("path"));
+function computeImgOutputPath(imgInputPath, { contentDir, publicDir, format, size, alignment }) {
+    const imgRelativePath = path_1.default.relative(contentDir, imgInputPath);
+    const imgDir = path_1.default.dirname(imgRelativePath);
+    const inputExt = path_1.default.extname(imgRelativePath);
+    const fileName = path_1.default.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_1.default.join(publicDir, imgDir, `${fileName}${suffix}${ext}`);
+}
+exports.computeImgOutputPath = computeImgOutputPath;
+//# sourceMappingURL=computeImgOutputPath.js.map

package/dist/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,gDAAwB;AAIxB,SAAgB,oBAAoB,CAClC,YAAoB,EACpB,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAqC;IAErF,MAAM,eAAe,GAAG,cAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAEhE,MAAM,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAE7C,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,cAAI,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,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,QAAQ,GAAG,MAAM,GAAG,GAAG,EAAE,CAAC,CAAC;AACpE,CAAC;AAfD,oDAeC"}

package/dist/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/dist/content-page-repository/resizeImg.js

@@ -0,0 +1,19 @@
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resizeImg = void 0;
+const sharp_1 = __importDefault(require("sharp"));
+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_1.default.fit.fill : sharp_1.default.fit.contain,
+        background: { r: 0, g: 0, b: 0, alpha: 0 },
+        ...options,
+    })
+    : chain;
+exports.resizeImg = resizeImg;
+//# sourceMappingURL=resizeImg.js.map

package/dist/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,kDAA0B;AAGnB,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,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,eAAK,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;AAbD,QAAA,SAAS,aAaR"}

package/dist/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/dist/content-page-repository/transformContentPage.js

@@ -2,7 +2,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformContentPage = void 0;
+exports.generatedPagePath = exports.transformContentPage = void 0;
 const fs_1 = __importDefault(require("fs"));
 const util_1 = __importDefault(require("util"));
 const mapJSON_1 = require("./mapJSON");
@@ -10,33 +10,39 @@ const transformHTML_1 = require("./transformHTML");
 const transformMarkdown_1 = require("./transformMarkdown");
 const transformPicture_1 = require("./transformPicture");
 const readFile = util_1.default.promisify(fs_1.default.readFile);
+const writeFile = util_1.default.promisify(fs_1.default.writeFile);
+const OUTPUT_SUFFIX = '.static';
 async function transformContentPage(pagePath, options) {
     const content = await readFile(pagePath, 'utf8');
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    return (0, mapJSON_1.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 (0, transformMarkdown_1.transformMarkdown)(value);
-        }
-        else if (isHTML) {
-            return await (0, transformHTML_1.transformHTML)(value);
-        }
-        else if (isPicture(value)) {
-            try {
-                return await (0, transformPicture_1.transformPicture)(pagePath, value, options);
+    const result = await (0, mapJSON_1.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 (0, transformMarkdown_1.transformMarkdown)(value);
             }
-            catch (ex) {
-                console.warn('Error while transforming picture on page: %s', pagePath);
-                console.error(ex);
+            else if (isHTML) {
+                return await (0, transformHTML_1.transformHTML)(value);
             }
+            else if (isPicture(value)) {
+                return await (0, transformPicture_1.transformPicture)(value, pagePath, options);
+            }
+        }
+        catch (ex) {
+            console.warn(`Error while transforming field "${key}" on page: ${pagePath}`);
+            console.error(ex);
         }
         return value;
     });
+    await writeFile((0, exports.generatedPagePath)(pagePath), JSON.stringify(result), 'utf-8');
+    return result;
 }
 exports.transformContentPage = transformContentPage;
-const isLocalPath = (_) => isString(_) && _.length < 512 && !isURL(_);
-const isString = (_) => Boolean(_ && typeof _ === 'string');
-const isURL = (src) => ['data:', 'https:', 'http:'].some((proto) => src.startsWith(proto));
+const generatedPagePath = (pagePath) => `${pagePath}${OUTPUT_SUFFIX}`;
+exports.generatedPagePath = generatedPagePath;
 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/dist/content-page-repository/transformContentPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformContentPage.js","sourceRoot":"","sources":["../../src/content-page-repository/transformContentPage.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAGxB,uCAAoC;AAEpC,mDAAgD;AAChD,2DAAwD;AACxD,yDAAsD;AAEtD,MAAM,QAAQ,GAAG,cAAI,CAAC,SAAS,CAAC,YAAE,CAAC,QAAQ,CAAC,CAAC;AAEtC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,OAA8B;IAE9B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEjD,iEAAiE;IACjE,OAAO,IAAA,iBAAO,EAAiB,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,IAAA,qCAAiB,EAAC,KAAK,CAAC,CAAC;SACvC;aAAM,IAAI,MAAM,EAAE;YACjB,OAAO,MAAM,IAAA,6BAAa,EAAC,KAAK,CAAC,CAAC;SACnC;aAAM,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE;YAC3B,IAAI;gBACF,OAAO,MAAM,IAAA,mCAAgB,EAAC,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;AA1BD,oDA0BC;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,4CAAoB;AACpB,gDAAwB;AAGxB,uCAAoC;AAEpC,mDAAgD;AAChD,2DAAwD;AACxD,yDAAsD;AAEtD,MAAM,QAAQ,GAAG,cAAI,CAAC,SAAS,CAAC,YAAE,CAAC,QAAQ,CAAC,CAAC;AAC7C,MAAM,SAAS,GAAG,cAAI,CAAC,SAAS,CAAC,YAAE,CAAC,SAAS,CAAC,CAAC;AAE/C,MAAM,aAAa,GAAG,SAAS,CAAC;AAEzB,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,IAAA,iBAAO,EAAiB,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,IAAA,qCAAiB,EAAC,KAAK,CAAC,CAAC;aACvC;iBAAM,IAAI,MAAM,EAAE;gBACjB,OAAO,MAAM,IAAA,6BAAa,EAAC,KAAK,CAAC,CAAC;aACnC;iBAAM,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE;gBAC3B,OAAO,MAAM,IAAA,mCAAgB,EAAC,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,IAAA,yBAAiB,EAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAE9E,OAAO,MAAM,CAAC;AAChB,CAAC;AA9BD,oDA8BC;AAEM,MAAM,iBAAiB,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,GAAG,QAAQ,GAAG,aAAa,EAAE,CAAC;AAAxE,QAAA,iBAAiB,qBAAuD;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/dist/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/dist/content-page-repository/transformImg.js

@@ -8,87 +8,37 @@ const path_1 = __importDefault(require("path"));
 const sharp_1 = __importDefault(require("sharp"));
 const util_1 = __importDefault(require("util"));
 const isPictureSizeEmpty_1 = require("../utils/isPictureSizeEmpty");
-const transformImgPath_1 = require("./transformImgPath");
+const alignImg_1 = require("./alignImg");
+const computeImgOutputPath_1 = require("./computeImgOutputPath");
+const resizeImg_1 = require("./resizeImg");
 const mkdir = util_1.default.promisify(fs_1.default.mkdir);
-async function transformImg({ pagePath, src, containerSize, transformationOptions, }) {
+const defaultTransformationCache = new Map();
+function transformImg(src, pagePath, options) {
     if (!src) {
         return '';
     }
-    const { contentDir, publicDir, format, options, size, alignment } = transformationOptions;
-    const pageDir = path_1.default.dirname(pagePath);
-    const imgPath = `${pageDir}/${src}`;
-    let chain = (0, sharp_1.default)(imgPath);
-    const targetSize = getPictureSize(size, containerSize);
-    if (targetSize) {
-        chain = resizeImg(chain, targetSize, getResizeFit(targetSize));
+    const input = path_1.default.join(path_1.default.dirname(pagePath), src);
+    const output = (0, computeImgOutputPath_1.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((0, sharp_1.default)(data), getCompositionResizeSize(containerSize, targetSize), getResizeFit(targetSize));
-        chain = await compositeImg({ chain, containerSize, alignment });
-    }
-    if (format) {
-        chain = chain.toFormat(format, options);
-    }
-    const transformedImgPath = (0, transformImgPath_1.transformImgPath)(src, { pageDir, contentDir }, transformationOptions);
-    const imgPublicPath = path_1.default.join(publicDir, transformedImgPath);
-    await mkdir(path_1.default.dirname(imgPublicPath), { recursive: true });
-    try {
-        await chain.toFile(imgPublicPath);
-    }
-    catch (e) {
-        console.error(e);
-    }
-    return transformedImgPath;
+    const result = (async () => {
+        try {
+            await mkdir(path_1.default.dirname(output), { recursive: true });
+            const chain = await computeTransformationChain(options)((0, sharp_1.default)(input));
+            await chain.toFile(output);
+        }
+        catch (e) {
+            console.error(e);
+        }
+        return output;
+    })();
+    cache.set(output, result);
+    return result;
 }
 exports.transformImg = transformImg;
-function createBackgroundImageChain({ width, height }) {
-    const channels = 4;
-    const rgbaColor = 0x00000000;
-    const canvas = Buffer.alloc(width * height * channels, rgbaColor);
-    return (0, sharp_1.default)(canvas, { raw: { width, height, channels } });
-}
-function resizeImg(chain, size, options) {
-    return chain.resize(size?.width || null, size?.height || null, {
-        fit: sharp_1.default.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 (0, isPictureSizeEmpty_1.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_1.default.fit.fill : sharp_1.default.fit.contain,
-    };
-}
+const computeTransformationChain = ({ size, containerSize, alignment, format, options, }) => pipe((0, resizeImg_1.resizeImg)((0, isPictureSizeEmpty_1.isPictureSizeEmpty)(size) ? containerSize : size), (0, alignImg_1.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/dist/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,4CAAoB;AACpB,gDAAwB;AACxB,kDAA0C;AAC1C,gDAAwB;AAGxB,oEAAiE;AACjE,yCAAsC;AACtC,iEAA8D;AAC9D,2CAAwC;AAGxC,MAAM,KAAK,GAAG,cAAI,CAAC,SAAS,CAAC,YAAE,CAAC,KAAK,CAAC,CAAC;AASvC,MAAM,0BAA0B,GAA6B,IAAI,GAAG,EAAE,CAAC;AAEvE,SAAgB,YAAY,CAC1B,GAAW,EACX,QAAgB,EAChB,OAA4B;IAE5B,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,EAAE,CAAC;KACX;IAED,MAAM,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,IAAA,2CAAoB,EAAC,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,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAEvD,MAAM,KAAK,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,CAAC,IAAA,eAAK,EAAC,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;AAlCD,oCAkCC;AAED,MAAM,0BAA0B,GAAG,CAAC,EAClC,IAAI,EACJ,aAAa,EACb,SAAS,EACT,MAAM,EACN,OAAO,GACa,EAAE,EAAE,CACxB,IAAI,CACF,IAAA,qBAAS,EAAC,IAAA,uCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,EAC1D,IAAA,mBAAQ,EAAC,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/dist/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/dist/content-page-repository/transformPicture.js

@@ -6,28 +6,20 @@ exports.transformPicture = void 0;
 const path_1 = __importDefault(require("path"));
 const sharp_1 = __importDefault(require("sharp"));
 const transformImg_1 = require("./transformImg");
-async function transformPicture(pagePath, picture, options) {
-    const sources = picture.sources || [];
+async function transformPicture(picture, pagePath, options) {
     const src = picture?.src || '';
-    const transformedPicture = await (0, transformImg_1.transformImg)({
-        pagePath,
-        src,
-        transformationOptions: { ...options, ...picture },
-    });
-    const { width, height } = await (0, sharp_1.default)(path_1.default.resolve(options.publicDir, transformedPicture)).metadata();
+    const transformedImgPath = await (0, transformImg_1.transformImg)(src, pagePath, { ...options, ...picture });
+    const { width, height } = await (0, sharp_1.default)(transformedImgPath).metadata();
     const containerSize = width && height ? { width, height } : undefined;
-    const transformedSources = await Promise.all(sources.map((_) => (0, transformImg_1.transformImg)({
-        pagePath,
-        src,
-        containerSize,
-        transformationOptions: { ...options, ..._ },
-    })));
+    const sources = picture.sources || [];
+    const transformedSources = await Promise.all(sources.map((_) => (0, transformImg_1.transformImg)(src, pagePath, { ...options, ..._, containerSize })));
+    const imgPathToSrc = (_) => path_1.default.join('/', path_1.default.relative(options.publicDir, _));
     return {
         ...picture,
-        src: path_1.default.join('/', transformedPicture),
+        src: imgPathToSrc(transformedImgPath),
         sources: transformedSources.map((_, i) => ({
             ...sources[i],
-            src: path_1.default.join('/', _),
+            src: imgPathToSrc(_),
             size: { width, height },
         })),
     };

package/dist/content-page-repository/transformPicture.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformPicture.js","sourceRoot":"","sources":["../../src/content-page-repository/transformPicture.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,kDAA0B;AAG1B,iDAA8C;AAEvC,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,OAAgB,EAChB,OAA8B;IAE9B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IAE/B,MAAM,kBAAkB,GAAG,MAAM,IAAA,2BAAY,EAAC;QAC5C,QAAQ;QACR,GAAG;QACH,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE;KAClD,CAAC,CAAC;IAEH,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,eAAK,EACnC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,kBAAkB,CAAC,CACpD,CAAC,QAAQ,EAAE,CAAC;IAEb,MAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAEtE,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAChB,IAAA,2BAAY,EAAC;QACX,QAAQ;QACR,GAAG;QACH,aAAa;QACb,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,EAAE;KAC5C,CAAC,CACH,CACF,CAAC;IAEF,OAAO;QACL,GAAG,OAAO;QACV,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,CAAC;QACvC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACzC,GAAG,OAAO,CAAC,CAAC,CAAC;YACb,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;SACxB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAxCD,4CAwCC"}
+{"version":3,"file":"transformPicture.js","sourceRoot":"","sources":["../../src/content-page-repository/transformPicture.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,kDAA0B;AAG1B,iDAA8C;AAEvC,KAAK,UAAU,gBAAgB,CACpC,OAAgB,EAChB,QAAgB,EAChB,OAA8B;IAE9B,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IAE/B,MAAM,kBAAkB,GAAG,MAAM,IAAA,2BAAY,EAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAEzF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,eAAK,EAAC,kBAAkB,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrE,MAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAEtE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,2BAAY,EAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CACrF,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAExF,OAAO;QACL,GAAG,OAAO;QACV,GAAG,EAAE,YAAY,CAAC,kBAAkB,CAAC;QACrC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACzC,GAAG,OAAO,CAAC,CAAC,CAAC;YACb,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC;YACpB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;SACxB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AA5BD,4CA4BC"}

package/dist/ui-kit/InputListRange/InputListRange.d.ts

@@ -0,0 +1,2 @@
+import type { InputListRangeProps } from './InputListRangeProps';
+export declare const InputListRange: import("@redneckz/uni-jsx").UNIComponent<InputListRangeProps, any, any>;