@redneckz/wildless-cms-uni-blocks 0.2.69 → 0.2.72

package/src/TextBlock.tsx

@@ -1,17 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps, Picture } from './types';
 import { Img } from './Img';
-
-type TextBlockVersion = 'primary' | 'secondary' | 'secondary-light';
-type TextBlockIconVersion = 'none' | 'small' | 'big';
-
-export interface TextBlockContent {
-  title?: string;
-  description?: string;
-  blockVersion?: TextBlockVersion;
-  iconVersion?: TextBlockIconVersion;
-  image?: Picture;
-}
+import type { Picture } from './model/Picture';
+import type { TextBlockContent, TextBlockVersion } from './TextBlockContent';
+import type { UniBlockProps } from './types';
 
 export interface TextBlockProps extends TextBlockContent, UniBlockProps {}
 

package/src/TextBlockContent.ts

@@ -0,0 +1,12 @@
+import type { Picture } from './model/Picture';
+
+export type TextBlockVersion = 'primary' | 'secondary' | 'secondary-light';
+export type TextBlockIconVersion = 'none' | 'small' | 'big';
+
+export interface TextBlockContent {
+  title?: string;
+  description?: string;
+  blockVersion?: TextBlockVersion;
+  iconVersion?: TextBlockIconVersion;
+  image?: Picture;
+}

package/src/Tile.fixture.tsx

@@ -1,7 +1,7 @@
 import { context } from './setup-fixture';
 
 import { Tile } from './Tile';
-import { Picture } from './types';
+import { Picture } from './model/Picture';
 
 const image: Picture = {
   src: 'money-1.png',

package/src/Tile.tsx

@@ -1,10 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { BlockVersion, UniBlockProps } from './types';
 import { BaseTile } from './BaseTile';
-import type { BaseTileContent } from './BaseTile';
+import type { BlockVersion } from './model/BlockVersion';
+import type { TileContent } from './TileContent';
+import type { UniBlockProps } from './types';
 import { getColSpan } from './utils/getColSpan';
 
-export interface TileProps extends BaseTileContent, UniBlockProps {}
+export interface TileProps extends TileContent, UniBlockProps {}
 
 const tileStyleMap: Record<BlockVersion, string> = {
   primary: 'bg-white text-primary-text',

package/src/TileContent.ts

@@ -0,0 +1,3 @@
+import type { BaseTileContent } from './BaseTileContent';
+
+export type TileContent = BaseTileContent;

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

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import util from 'util';
-import type { ContentPageDef, Picture } from '../types';
+import type { Picture } from '../model/Picture';
+import type { ContentPageDef } from '../types';
 import { mapJSON } from './mapJSON';
 import type { TransformationOptions } from './TransformationOptions';
 import { transformMarkdown } from './transformMarkdown';

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

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import sharp from 'sharp';
 import util from 'util';
-import type { ImgSource, Picture } from '../types';
+import type { ImgSource, Picture } from '../model/Picture';
 import type { TransformationOptions } from './TransformationOptions';
 
 const mkdir = util.promisify(fs.mkdir);

package/src/index.ts

@@ -1,20 +1,15 @@
+export { setup } from '@redneckz/uni-jsx';
+
 export type { ProjectSettings } from './ProjectSettings';
 export { projectSettings } from './ProjectSettings';
 
 export { LikeAPI } from './api/LikeAPI';
 export { DaDataAPI } from './api/DaDataAPI';
 
-export type { HeaderContent as SitemapContent } from './Header';
+export type { SitemapContent } from './model/SitemapContent';
 
-export type {
-  BlockDef,
-  UniBlockProps,
-  ContentPageMeta,
-  ContentPageDef,
-  Img,
-  ImgSource,
-  Picture,
-} from './types';
+export type { Img, ImgSource, Picture } from './model/Picture';
+export type { BlockDef, UniBlockProps, ContentPageMeta, ContentPageDef } from './types';
 export type {
   ContentPageContext,
   Router,
@@ -31,7 +26,7 @@ export { ContentPage } from './ContentPage';
 export { toMobilePage } from './toMobilePage';
 
 export { Blocks } from './Blocks';
-export type { BlockContent } from './Blocks';
+export type { BlockContent } from './BlockContent';
 export { MobileBlocks } from './MobileBlocks';
 
 export * as url from './utils/url';

package/src/mergeTopItems.ts

@@ -1,13 +1,13 @@
-import type { TopMenuItem } from './types';
+import type { LinkContent } from './model/LinkContent';
 
-const cmp = (a?: TopMenuItem) => (b?: TopMenuItem) => a?.href === b?.href;
+const cmp = (a?: LinkContent) => (b?: LinkContent) => a?.href === b?.href;
 
-const substitute = (items?: TopMenuItem[], substitution?: TopMenuItem[]) =>
+const substitute = <L extends LinkContent>(items?: L[], substitution?: L[]): L[] =>
   (items || []).map((_) => substitution?.find(cmp(_)) || _);
 
-const subtract = (minuend?: TopMenuItem[], subtrahend?: TopMenuItem[]) =>
+const subtract = <L extends LinkContent>(minuend?: L[], subtrahend?: L[]): L[] =>
   (minuend || []).filter((_) => !subtrahend?.find(cmp(_)));
 
-export function mergeTopItems(left?: TopMenuItem[], right?: TopMenuItem[]): TopMenuItem[] {
+export function mergeTopItems<L extends LinkContent>(left?: L[], right?: L[]): L[] {
   return substitute(left, right).concat(subtract(right, left));
 }

package/src/model/BlockVersion.ts

@@ -0,0 +1 @@
+export type BlockVersion = 'primary' | 'secondary';

package/src/model/ButtonVersion.ts

@@ -0,0 +1 @@
+export type ButtonVersion = 'primary' | 'secondary';

package/src/model/LinkContent.ts

@@ -0,0 +1,5 @@
+export interface LinkContent {
+  text?: string;
+  href?: string;
+  target?: '_blank' | '_self' | '_parent' | '_top' | string;
+}

package/src/model/Picture.ts

@@ -0,0 +1,19 @@
+export interface Img {
+  src: string;
+  alt?: string;
+  title?: string;
+}
+
+export interface ImgSource {
+  src: string;
+  format?: 'jpeg' | 'jpg' | 'png' | 'gif' | 'webp' | 'heif' | 'avif';
+  options?: Record<string, any>;
+  size?: {
+    width?: number;
+    height?: number;
+  };
+}
+
+export interface Picture extends Img, ImgSource {
+  sources?: ImgSource[];
+}

package/src/model/SitemapContent.ts

@@ -0,0 +1,9 @@
+import { LinkContent } from '../model/LinkContent';
+
+export interface TopMenuItem extends LinkContent {
+  items?: LinkContent[];
+}
+
+export interface SitemapContent {
+  topItems?: TopMenuItem[];
+}

package/src/types.ts

@@ -1,21 +1,9 @@
-import type {
-  AvifOptions,
-  FormatEnum,
-  GifOptions,
-  HeifOptions,
-  JpegOptions,
-  PngOptions,
-  ResizeOptions,
-  TiffOptions,
-  WebpOptions,
-} from 'sharp';
-import type { BlockContent } from './Blocks';
+import type { BlockContent } from './BlockContent';
 import type { ContentPageContext } from './ContentPageContext';
+import type { BlockVersion } from './model/BlockVersion';
 
 export type ColorPalette = 'pc' | 'bc' | 'eo';
 
-export type BlockVersion = 'primary' | 'secondary';
-export type ButtonVersion = 'primary' | 'secondary';
 export interface BlockDef {
   type: string;
   style?: string[];
@@ -43,53 +31,11 @@ export interface ContentPageDef extends ContentPageMeta {
   colorPalette?: ColorPalette;
 }
 
-export interface Img {
-  src: string;
-  alt?: string;
-  title?: string;
-}
-
-export interface ImgSource {
-  src: string;
-  format?: keyof FormatEnum;
-  options?:
-    | JpegOptions
-    | PngOptions
-    | WebpOptions
-    | AvifOptions
-    | HeifOptions
-    | GifOptions
-    | TiffOptions;
-  size?: ResizeOptions;
-}
-
-export interface Picture extends Img, ImgSource {
-  sources?: ImgSource[];
-}
-
 export interface UniBlockProps {
   className?: string;
   context: ContentPageContext;
 }
 
-export interface ContactInfo {
-  text: string;
-  type: 'tel' | 'email';
-  description: string;
-}
-
-export interface LinkContent {
-  text?: string;
-  href?: string;
-  target?: '_blank' | '_self' | '_parent' | '_top' | string;
-}
-
-export type NavMenuItem = LinkContent;
-
-export interface TopMenuItem extends NavMenuItem {
-  items?: NavMenuItem[];
-}
-
 export interface DaDataResult {
   suggestions?: DaDataSuggestion<DaDataAddress>[];
 }

package/src/ui-kit/Breadcrumb.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkContent } from '../types';
+import type { LinkContent } from '../model/LinkContent';
 
 export interface BreadcrumbProps extends LinkContent {
   className?: string;

package/src/ui-kit/Button.tsx

@@ -1,13 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { ButtonVersion, LinkContent } from '../types';
-
-export interface ButtonProps extends LinkContent {
-  className?: string;
-  onClick?: (ev: MouseEvent) => any;
-  version?: ButtonVersion;
-  ariaLabel?: string;
-  disabled?: Boolean;
-}
+import type { ButtonVersion } from '../model/ButtonVersion';
+import type { ButtonProps } from './ButtonProps';
 
 const buttonStyleMap: Record<ButtonVersion, string> = {
   primary: 'text-white bg-primary-main hover:bg-primary-hover active:bg-primary-active',

package/src/ui-kit/ButtonProps.ts

@@ -0,0 +1,10 @@
+import type { ButtonVersion } from '../model/ButtonVersion';
+import type { LinkContent } from '../model/LinkContent';
+
+export interface ButtonProps extends LinkContent {
+  className?: string;
+  onClick?: (ev: MouseEvent) => any;
+  version?: ButtonVersion;
+  ariaLabel?: string;
+  disabled?: boolean;
+}

package/src/ui-kit/Icon.tsx

@@ -1,37 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { projectSettings } from '../ProjectSettings';
-
-export type IconName =
-  | 'ActualBalanceIcon'
-  | 'AppleIcon'
-  | 'CalendarIcon'
-  | 'ClockIcon'
-  | 'ComfortableCompIcon'
-  | 'DollarIcon'
-  | 'EmptyWalletIcon'
-  | 'EuroIcon'
-  | 'GridIcon'
-  | 'LoupeIcon'
-  | 'NewDocIcon'
-  | 'OkIcon'
-  | 'PassSendIcon'
-  | 'PercentageSquareIcon'
-  | 'PlayMarketIcon'
-  | 'ProfileIcon'
-  | 'SignDocsIcon'
-  | 'TelegramIcon'
-  | 'VKIcon'
-  | 'ArrowLeftIcon';
-
-export interface IconProps {
-  className?: string;
-  name: IconName;
-  alt?: string;
-  title?: string;
-  width?: string;
-  height?: string;
-  'aria-hidden'?: 'true';
-}
+import type { IconProps } from './IconProps';
 
 export const Icon = JSX<IconProps>(
   ({ className, name, alt = `Icon ${name}`, title = alt, ...imgProps }) => (

package/src/ui-kit/IconButton.tsx

@@ -1,12 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { ButtonProps } from './Button';
 import { Button } from './Button';
-import { Icon, IconName } from './Icon';
-
-export interface IconButtonProps extends ButtonProps {
-  icon?: IconName;
-  aboveText?: string;
-}
+import { Icon } from './Icon';
+import type { IconButtonProps } from './IconButtonProps';
 
 export const IconButton = JSX<IconButtonProps>((props) => {
   return (

package/src/ui-kit/IconButtonProps.ts

@@ -0,0 +1,7 @@
+import type { ButtonProps } from './ButtonProps';
+import type { IconName } from './IconProps';
+
+export interface IconButtonProps extends ButtonProps {
+  icon?: IconName;
+  aboveText?: string;
+}

package/src/ui-kit/IconProps.ts

@@ -0,0 +1,31 @@
+export type IconName =
+  | 'ActualBalanceIcon'
+  | 'AppleIcon'
+  | 'CalendarIcon'
+  | 'ClockIcon'
+  | 'ComfortableCompIcon'
+  | 'DollarIcon'
+  | 'EmptyWalletIcon'
+  | 'EuroIcon'
+  | 'GridIcon'
+  | 'LoupeIcon'
+  | 'NewDocIcon'
+  | 'OkIcon'
+  | 'PassSendIcon'
+  | 'PercentageSquareIcon'
+  | 'PlayMarketIcon'
+  | 'ProfileIcon'
+  | 'SignDocsIcon'
+  | 'TelegramIcon'
+  | 'VKIcon'
+  | 'ArrowLeftIcon';
+
+export interface IconProps {
+  className?: string;
+  name: IconName;
+  alt?: string;
+  title?: string;
+  width?: string;
+  height?: string;
+  'aria-hidden'?: 'true';
+}

package/src/ui-kit/Title.tsx

@@ -1,17 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-
-export enum SizeTableClass {
-  'XL' = 'text-title-lg',
-  'L' = 'text-title',
-  'M' = 'text-title-sm',
-  'S' = 'text-title-xs',
-}
-
-export type TitleSize = keyof typeof SizeTableClass;
-
-export interface TitleProps extends Partial<HTMLHeadingElement> {
-  size?: TitleSize;
-}
+import { SizeTableClass, TitleProps } from './TitleProps';
 
 export const Title = JSX<TitleProps>(({ size = 'L', className, children, ...rest }) => {
   const Tag = size === 'XL' ? 'h1' : 'h2';

package/src/ui-kit/TitleProps.ts

@@ -0,0 +1,12 @@
+export enum SizeTableClass {
+  'XL' = 'text-title-lg',
+  'L' = 'text-title',
+  'M' = 'text-title-sm',
+  'S' = 'text-title-xs',
+}
+
+export type TitleSize = keyof typeof SizeTableClass;
+
+export interface TitleProps extends Partial<HTMLHeadingElement> {
+  size?: TitleSize;
+}

package/src/ui-kit/TopItem.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkContent } from '../types';
+import type { LinkContent } from '../model/LinkContent';
 
 export interface TopItemContent extends LinkContent {
   active?: boolean;

package/src/useLink.ts

@@ -1,5 +1,5 @@
 import { HandlerDecorator, Router } from './ContentPageContext';
-import type { LinkContent } from './types';
+import type { LinkContent } from './model/LinkContent';
 import { adjustHref, isURL } from './utils/url';
 
 const defaultHandlerDecorator: HandlerDecorator = (handler, targetContent) => handler;
@@ -9,7 +9,7 @@ export function useLink(
     router,
     handlerDecorator = defaultHandlerDecorator,
   }: { router: Router; handlerDecorator?: HandlerDecorator },
-  link: Partial<LinkContent>,
+  link: Partial<LinkContent & { className: string }>,
 ) {
   const href = adjustHref(link.href, router);
   return {

package/src/useSitemap.ts

@@ -1,5 +1,5 @@
 import type { AsyncDataHook } from './ContentPageContext';
-import type { HeaderContent } from './Header/index';
+import type { HeaderContent } from './Header/HeaderContent';
 import { projectSettings } from './ProjectSettings';
 
 export function useSitemap(useAsyncData: AsyncDataHook): HeaderContent {

package/dist/Footer/index.d.ts

@@ -1,2 +0,0 @@
-export { Footer } from './Footer';
-export type { FooterContent, FooterProps } from './Footer';

package/dist/Footer/index.js

@@ -1,5 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Footer = void 0;
-var Footer_1 = require("./Footer");
-Object.defineProperty(exports, "Footer", { enumerable: true, get: function () { return Footer_1.Footer; } });
-//# sourceMappingURL=index.js.map

package/dist/Footer/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Footer/index.ts"],"names":[],"mappings":";;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA"}

package/dist/Header/index.d.ts

@@ -1,3 +0,0 @@
-export { Header } from './Header';
-export type { HeaderProps } from './Header';
-export type { HeaderContent } from './HeaderContent';

package/dist/Header/index.js

@@ -1,5 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Header = void 0;
-var Header_1 = require("./Header");
-Object.defineProperty(exports, "Header", { enumerable: true, get: function () { return Header_1.Header; } });
-//# sourceMappingURL=index.js.map

package/dist/Header/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Header/index.ts"],"names":[],"mappings":";;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA"}

package/lib/Footer/index.d.ts

@@ -1,2 +0,0 @@
-export { Footer } from './Footer';
-export type { FooterContent, FooterProps } from './Footer';

package/lib/Footer/index.js

@@ -1,2 +0,0 @@
-export { Footer } from './Footer.js';
-//# sourceMappingURL=index.js.map

package/lib/Footer/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Footer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}

package/lib/Header/index.d.ts

@@ -1,3 +0,0 @@
-export { Header } from './Header';
-export type { HeaderProps } from './Header';
-export type { HeaderContent } from './HeaderContent';

package/lib/Header/index.js

@@ -1,2 +0,0 @@
-export { Header } from './Header.js';
-//# sourceMappingURL=index.js.map

package/lib/Header/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Header/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}

package/src/Footer/index.ts

@@ -1,2 +0,0 @@
-export { Footer } from './Footer';
-export type { FooterContent, FooterProps } from './Footer';

package/src/Header/index.ts

@@ -1,3 +0,0 @@
-export { Header } from './Header';
-export type { HeaderProps } from './Header';
-export type { HeaderContent } from './HeaderContent';