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

package/src/content-page-repository/ContentPageRepository.ts

@@ -1,26 +1,16 @@
+import fs from 'fs';
 import glob from 'glob';
 import util from 'util';
 import type { ContentPageDef } from '../model/ContentPageDef';
 import type { TransformationOptions } from './TransformationOptions';
-import { transformContentPage } from './transformContentPage';
+import { generatedPagePath, transformContentPage } from './transformContentPage';
 
-const INDEX_PAGE_SLUG = 'index';
 const find = util.promisify(glob);
-
-const bySlug = (slug: string) => (content: ContentPageDef) => content.slug === slug;
-const byCustomPageType = (type?: string) => (content: ContentPageDef) =>
-  type ? content._customPageType === type : !content._customPageType;
-
-const not =
-  <Arg>(predicate: (_: Arg) => boolean) =>
-  (_: Arg) =>
-    !predicate(_);
+const readFile = util.promisify(fs.readFile);
 
 export class ContentPageRepository {
   public static readonly inst = new ContentPageRepository();
 
-  private cache: Record<string, ContentPageDef> = {};
-
   constructor(
     private readonly options: TransformationOptions = {
       contentDir: 'content',
@@ -28,37 +18,15 @@ export class ContentPageRepository {
     },
   ) {}
 
-  async listAllContentPages(): Promise<string[]> {
+  listAllContentPages(): Promise<string[]> {
     return find(`${this.options.contentDir}/**/*.page.json`);
   }
 
-  async getAllContentPages(): Promise<ContentPageDef[]> {
-    const pagePaths = await this.listAllContentPages();
-
-    return Promise.all(pagePaths.map((_) => this.readPage(_)));
-  }
-
-  async getSecondaryContentPages(customPageType?: string): Promise<ContentPageDef[]> {
-    const pages = await this.getAllContentPages();
-
-    return pages.filter(not(bySlug(INDEX_PAGE_SLUG))).filter(byCustomPageType(customPageType));
-  }
-
-  async getContentPageBySlug(slug: string): Promise<ContentPageDef | undefined> {
-    const pages = await this.getAllContentPages();
-
-    return pages.find(bySlug(slug));
-  }
-
-  async getIndexPage(): Promise<ContentPageDef | undefined> {
-    return this.getContentPageBySlug(INDEX_PAGE_SLUG);
-  }
-
   async readPage(filePath: string): Promise<ContentPageDef> {
-    if (!(filePath in this.cache)) {
-      this.cache[filePath] = await transformContentPage(filePath, this.options);
-    }
+    return JSON.parse(await readFile(generatedPagePath(filePath), 'utf-8'));
+  }
 
-    return this.cache[filePath];
+  generatePage(filePath: string): Promise<ContentPageDef> {
+    return transformContentPage(filePath, this.options);
   }
 }

package/src/content-page-repository/alignImg.ts

@@ -0,0 +1,32 @@
+import type { Sharp } from 'sharp';
+import sharp from 'sharp';
+import type { ImageSize } from '../model/ImageSize';
+import type { ImgAlignment } from '../model/Picture';
+
+interface ImgAlignmentParams {
+  containerSize?: Partial<ImageSize>;
+  alignment?: ImgAlignment;
+}
+
+export const alignImg =
+  ({ containerSize, alignment }: ImgAlignmentParams) =>
+  async (chain: Sharp): Promise<Sharp> =>
+    containerSize?.width && containerSize?.height && alignment
+      ? createTransparentBack(containerSize as ImageSize).composite([
+          {
+            input: await toBuffer(chain),
+            gravity: alignment,
+          },
+        ])
+      : chain;
+
+const toBuffer = async (chain: Sharp) => (await chain.toBuffer({ resolveWithObject: true })).data;
+
+function createTransparentBack({ width, height }: ImageSize) {
+  const channels = 4;
+  const rgbaColor = 0x00000000;
+
+  const canvas = Buffer.alloc(width * height * channels, rgbaColor);
+
+  return sharp(canvas, { raw: { width, height, channels } });
+}

package/src/content-page-repository/computeImgOutputPath.ts

@@ -0,0 +1,20 @@
+import path from 'path';
+import type { ImgSource } from '../model/Picture';
+import type { TransformationOptions } from './TransformationOptions';
+
+export function computeImgOutputPath(
+  imgInputPath: string,
+  { contentDir, publicDir, format, size, alignment }: TransformationOptions & ImgSource,
+): string {
+  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}`);
+}

package/src/content-page-repository/resizeImg.ts

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

package/src/content-page-repository/transformContentPage.ts

@@ -9,6 +9,9 @@ import { transformMarkdown } from './transformMarkdown';
 import { transformPicture } from './transformPicture';
 
 const readFile = util.promisify(fs.readFile);
+const writeFile = util.promisify(fs.writeFile);
+
+const OUTPUT_SUFFIX = '.static';
 
 export async function transformContentPage(
   pagePath: string,
@@ -17,31 +20,35 @@ export async function transformContentPage(
   const content = await readFile(pagePath, 'utf8');
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-  return mapJSON<ContentPageDef>(JSON.parse(content), async (value: any, [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);
-      } catch (ex) {
-        console.warn('Error while transforming picture on page: %s', pagePath);
-        console.error(ex);
+  const result = await mapJSON<ContentPageDef>(JSON.parse(content), async (value: any, [key]) => {
+    const isMarkdown = isString(value) && key?.endsWith('__md');
+    const isHTML = isString(value) && key?.endsWith('__html');
+
+    try {
+      if (isMarkdown) {
+        return await transformMarkdown(value);
+      } 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;
   });
-}
 
-const isLocalPath = (_: any): boolean => isString(_) && _.length < 512 && !isURL(_);
+  await writeFile(generatedPagePath(pagePath), JSON.stringify(result), 'utf-8');
 
-const isString = (_: any): _ is string => Boolean(_ && typeof _ === 'string');
+  return result;
+}
 
-const isURL = (src: string) => ['data:', 'https:', 'http:'].some((proto) => src.startsWith(proto));
+export const generatedPagePath = (pagePath: string) => `${pagePath}${OUTPUT_SUFFIX}`;
 
 const isPicture = (_: any): _ is Picture => Boolean(_ && isLocalPath(_?.src));
+const isLocalPath = (_: any): boolean => isString(_) && _.length < 1024 && !isURL(_);
+const isURL = (src: string) => ['data:', 'https:', 'http:'].some((proto) => src.startsWith(proto));
+
+const isString = (_: any): _ is string => Boolean(_ && typeof _ === 'string');

package/src/content-page-repository/transformImg.ts

@@ -1,146 +1,74 @@
 import fs from 'fs';
 import path from 'path';
-import type { ResizeOptions, Sharp } from 'sharp';
-import sharp from 'sharp';
+import sharp, { type Sharp } from 'sharp';
 import util from 'util';
 import type { ImageSize } from '../model/ImageSize';
-import type { ImgAlignment, ImgSource, Picture } from '../model/Picture';
+import type { ImgSource } from '../model/Picture';
 import { isPictureSizeEmpty } from '../utils/isPictureSizeEmpty';
+import { alignImg } from './alignImg';
+import { computeImgOutputPath } from './computeImgOutputPath';
+import { resizeImg } from './resizeImg';
 import type { TransformationOptions } from './TransformationOptions';
-import { transformImgPath } from './transformImgPath';
 
 const mkdir = util.promisify(fs.mkdir);
 
-type TransformImgParams = {
-  pagePath: string;
-  src: string;
-  containerSize?: ImageSize;
-  transformationOptions: TransformationOptions & ImgSource;
-};
+type ImgOutputPath = string;
+type TransformationTaskKey = ImgOutputPath;
+type TransformationTasksCache = Map<TransformationTaskKey, Promise<ImgOutputPath>>;
 
-export async function transformImg({
-  pagePath,
-  src,
-  containerSize,
-  transformationOptions,
-}: TransformImgParams): Promise<string> {
-  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));
-  }
-
-  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),
-    );
+type TransformImgOptions = TransformationOptions &
+  ImgSource & { containerSize?: ImageSize; cache?: TransformationTasksCache };
 
-    chain = await compositeImg({ chain, containerSize, alignment });
-  }
+const defaultTransformationCache: TransformationTasksCache = new Map();
 
-  if (format) {
-    chain = chain.toFormat(format, options);
+export function transformImg(
+  src: string,
+  pagePath: string,
+  options: TransformImgOptions,
+): ImgOutputPath | Promise<ImgOutputPath> {
+  if (!src) {
+    return '';
   }
 
-  const transformedImgPath = transformImgPath(src, { pageDir, contentDir }, transformationOptions);
-  const imgPublicPath = path.join(publicDir, transformedImgPath);
+  const input = path.join(path.dirname(pagePath), src);
+  const output = computeImgOutputPath(input, options);
 
-  await mkdir(path.dirname(imgPublicPath), { recursive: true });
+  const { cache = defaultTransformationCache } = options;
 
-  try {
-    await chain.toFile(imgPublicPath);
-  } catch (e) {
-    console.error(e);
+  const cachedResult = cache.get(output);
+  if (cachedResult) {
+    return cachedResult;
   }
 
-  return transformedImgPath;
-}
+  const result = (async () => {
+    try {
+      await mkdir(path.dirname(output), { recursive: true });
 
-function createBackgroundImageChain({ width, height }: ImageSize) {
-  const channels = 4;
-  const rgbaColor = 0x00000000;
+      const chain = await computeTransformationChain(options)(sharp(input));
+      await chain.toFile(output);
+    } catch (e) {
+      console.error(e);
+    }
 
-  const canvas = Buffer.alloc(width * height * channels, rgbaColor);
+    return output;
+  })();
+  cache.set(output, result);
 
-  return sharp(canvas, { raw: { width, height, channels } });
+  return result;
 }
 
-function resizeImg(chain: Sharp, size: Picture['size'], options?: ResizeOptions) {
-  return chain.resize(size?.width || null, size?.height || null, {
-    fit: sharp.fit.fill,
-    background: { r: 0, g: 0, b: 0, alpha: 0 },
-    ...options,
-  });
-}
-
-type CompositeImgParams = {
-  chain: Sharp;
-  containerSize: ImageSize;
-  alignment?: ImgAlignment;
-};
-
-async function compositeImg({
-  chain,
+const computeTransformationChain = ({
+  size,
   containerSize,
   alignment,
-}: CompositeImgParams): Promise<Sharp> {
-  const { data } = await chain.toBuffer({ resolveWithObject: true });
-
-  return createBackgroundImageChain(containerSize).composite([
-    {
-      input: data,
-      gravity: alignment,
-    },
-  ]);
-}
-
-function getPictureSize(size: Picture['size'], containerSize?: ImageSize) {
-  // If containerSize is undefined intrinsic dimensions of image will be used then.
-  return isPictureSizeEmpty(size) ? containerSize : size;
-}
-
-function getCompositionResizeSize(
-  containerSize: ImageSize,
-  size: Picture['size'] = {},
-): Picture['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: Picture['size']): ResizeOptions {
-  /*
-    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,
-  };
-}
+  format,
+  options,
+}: TransformImgOptions) =>
+  pipe(
+    resizeImg(isPictureSizeEmpty(size) ? containerSize : size),
+    alignImg({ containerSize, alignment }),
+    (_) => (format ? _.toFormat(format, options) : _),
+  );
+
+const pipe = (...operations: Array<(chain: Sharp) => Promise<Sharp> | Sharp>) =>
+  operations.reduce((a, b) => async (chain: Sharp) => b(await a(chain)));

package/src/content-page-repository/transformPicture.ts

@@ -5,42 +5,30 @@ import type { TransformationOptions } from './TransformationOptions';
 import { transformImg } from './transformImg';
 
 export async function transformPicture(
-  pagePath: string,
   picture: Picture,
+  pagePath: string,
   options: TransformationOptions,
 ): Promise<Picture> {
-  const sources = picture.sources || [];
   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 sources = picture.sources || [];
   const transformedSources = await Promise.all(
-    sources.map((_) =>
-      transformImg({
-        pagePath,
-        src,
-        containerSize,
-        transformationOptions: { ...options, ..._ },
-      }),
-    ),
+    sources.map((_) => transformImg(src, pagePath, { ...options, ..._, containerSize })),
   );
 
+  const imgPathToSrc = (_: string) => 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 },
     })),
   };

package/src/ui-kit/InputListRange/InputListRange.tsx

@@ -0,0 +1,99 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
+import { clamp } from '../../utils/clamp';
+import { getSanitizedValue } from '../../utils/getSanitizedValue';
+import type { InputListRangeProps } from './InputListRangeProps';
+
+const DISABLED_INPUT_CLASSES = 'disabled:border-gray disabled:bg-main-divider';
+
+export const InputListRange = JSX<InputListRangeProps>(
+  ({ className, title, items = [], list = [], value = list[0], disabled = false, onChange }) => {
+    const min = 0;
+    const max = list.length - 1;
+    const step = 1;
+
+    const handleTextChange: JSX.IntrinsicElements['input']['onChange'] = (e) => {
+      if (!onChange) {
+        return;
+      }
+      const newValue = parseInt(e.target.value);
+
+      const closetValue = list.reduce(function (prev, curr) {
+        return Math.abs(curr - newValue) < Math.abs(prev - newValue) ? curr : prev;
+      });
+
+      onChange(Number(getSanitizedValue(closetValue.toString())));
+    };
+
+    const handleRangeChange: JSX.IntrinsicElements['input']['onChange'] = (e) => {
+      if (!onChange) {
+        return;
+      }
+
+      const val = list.at(clamp(parseInt(e.target.value), min, max)) || 0;
+      onChange(Number(getSanitizedValue(val.toString())));
+    };
+
+    const valueIndex = list.findIndex((item) => item === value) || 0;
+    const inputStyle = {
+      backgroundSize: `${(((valueIndex - min) * 100) / (max - min)).toFixed(2)}% 100%`,
+    };
+
+    return (
+      <div className={className}>
+        <label className="block relative">
+          {title ? <span className="text-m-light text-primary-text">{title}</span> : null}
+          <input
+            className={`m-0 mt-2 font-sans text-h3 w-full h-14 border border-solid border-gray rounded-md
+            outline-none p-0 pl-4 box-border text-primary-text hover:border-primary-hover focus:border-primary-text ${DISABLED_INPUT_CLASSES}`}
+            value={addSpacesBetweenNumbers(value)}
+            disabled={disabled}
+            onChange={handleTextChange}
+            onBlur={handleTextChange}
+          />
+          {list.length ? (
+            <div className="absolute w-full flex justify-between -bottom-[3px] px-4">
+              {list.map(renderTick(valueIndex, disabled))}
+            </div>
+          ) : null}
+          <div className="absolute inset-x-0 -bottom-1 px-4 leading-[18px]">
+            <input
+              className="box-border w-full m-0 cursor-pointer slider relative z-10"
+              type="range"
+              min={min}
+              max={max}
+              step={step}
+              value={valueIndex}
+              disabled={disabled}
+              onChange={handleRangeChange}
+              style={inputStyle}
+            />
+          </div>
+        </label>
+        {renderRangeCaption(items)}
+      </div>
+    );
+  },
+);
+
+const renderTick = (valueIndex: number, disabled: boolean) => (value: number, i: number) =>
+  (
+    <span
+      key={String(i)}
+      className={`w-2 h-2 rounded-full ${
+        valueIndex <= i || disabled ? 'bg-gray' : 'bg-primary-main'
+      }`}
+    />
+  );
+
+function renderRangeCaption(items: string[]) {
+  return (
+    <div className="flex justify-between my-2">
+      {items.map((item, i) => (
+        <span key={String(i)} className="text-s-light text-secondary-text">
+          {item}
+        </span>
+      ))}
+    </div>
+  );
+}

package/src/ui-kit/InputListRange/InputListRangeProps.ts

@@ -0,0 +1,11 @@
+import type { ListContent } from '../List/ListContent';
+
+export interface InputListRangeProps extends ListContent {
+  className?: string;
+  items?: string[];
+  list?: number[];
+  value?: number;
+  title?: string;
+  disabled?: boolean;
+  onChange?: (value: number) => void;
+}

package/src/ui-kit/Select/Select.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useOutsideClick } from '../../hooks/useOutsideClick';
 import { LabelProps } from '../../model/HeadlineType';
+import { Text } from '../../ui-kit/Text/Text';
 import { Icon } from '../Icon/Icon';
 
 export interface OptionProps {
@@ -39,7 +40,13 @@ export const Select = JSX<SelectProps>(
 
     return (
       <div className={`${className}`} ref={wrapperRef}>
-        {label ? <span className="mb-2 flex text-primary-text">{label}</span> : null}
+        {label ? (
+          <div className="mb-2">
+            <Text size="text-m" color="text-primary-text" font="font-light">
+              {label}
+            </Text>
+          </div>
+        ) : null}
         <div className={`relative ${isOpen ? 'z-20' : 'z-10'}`}>
           <div
             className={`text-l flex justify-between items-center mb-0.5 text-primary-text cursor-pointer

package/src/utils/arrayByRange.ts

@@ -0,0 +1,4 @@
+export const arrayByRange = (start: number, stop: number, step = 1) =>
+  Array.from({ length: Math.abs(stop - start) / step + 1 }, (value, index) =>
+    stop >= start ? start + index * step : start - index * step,
+  );

package/src/utils/isPictureSizeEmpty.ts

@@ -1,5 +1,5 @@
-import type { Picture } from '../model/Picture';
+import type { ImageSize } from '../model/ImageSize';
 
-export function isPictureSizeEmpty(size: Picture['size']): boolean {
-  return !(size?.width || size?.height);
+export function isPictureSizeEmpty(size: Partial<ImageSize> | undefined): boolean {
+  return !size?.width && !size?.height;
 }

package/src/utils/mergeIntervals.ts

@@ -0,0 +1,19 @@
+export const mergeIntervals = (intervals: number[][]): number[][] => {
+  const result = [...intervals];
+  result.sort(([a], [c]) => a - c);
+
+  let i = 1;
+
+  while (i < result.length) {
+    const [a, b] = result[i - 1];
+    const [c, d] = result[i];
+
+    if (b >= c) {
+      result.splice(i - 1, 2, [a, Math.max(b, d)]);
+    } else {
+      i++;
+    }
+  }
+
+  return result;
+};

package/bundle/content-page-repository/transformImgPath.d.ts

@@ -1,8 +0,0 @@
-import type { ImgSource } from '../model/Picture';
-import type { TransformationOptions } from './TransformationOptions';
-interface DirectoryParams {
-    pageDir: string;
-    contentDir: string;
-}
-export declare function transformImgPath(src: string, { pageDir, contentDir }: DirectoryParams, { format, size }: TransformationOptions & ImgSource): string;
-export {};

package/dist/content-page-repository/transformImgPath.d.ts

@@ -1,8 +0,0 @@
-import type { ImgSource } from '../model/Picture';
-import type { TransformationOptions } from './TransformationOptions';
-interface DirectoryParams {
-    pageDir: string;
-    contentDir: string;
-}
-export declare function transformImgPath(src: string, { pageDir, contentDir }: DirectoryParams, { format, size }: TransformationOptions & ImgSource): string;
-export {};