@redneckz/wildless-cms-uni-blocks 0.12.6 → 0.12.8

package/src/components/LinkDocs/LinkDocs.tsx

@@ -1,15 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { Router, useRouter } from '../../hooks/useRouter';
 import type { UniBlockProps } from '../../model/JSXBlock';
+import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Img } from '../../ui-kit/Img/Img';
+import { adjustHref } from '../../utils/adjustHref';
 import { style } from '../../utils/style';
 import { Headline } from '../Headline/Headline';
-import type { LinkColumnsMode, LinkDocsContent } from './LinkDocsContent';
-import { LinkDocsListItem } from './LinkDocsListItem';
+import { LinkDocItem } from './LinkDocItem';
+import type { DocBlockDef, LinkColumnsMode, LinkDocsContent } from './LinkDocsContent';
+import { linkIconStyle } from './linkIconStyle';
 
 const linkColumnsModeStyleMap: Record<LinkColumnsMode, string> = {
-  double: 'flex-wrap',
-  single: 'flex-col',
+  double: 'sm:flex-wrap sm:flex-row',
+  single: 'sm:flex-col',
 };
 
 export interface LinkDocsProps extends LinkDocsContent, UniBlockProps {}
@@ -24,36 +28,54 @@ export const LinkDocs = JSX<LinkDocsProps>(
     icon = { icon: 'DocIcon' },
     columnsMode = 'double',
     ...rest
-  }) => (
-    <BlockWrapper className={className} defaultPadding="p-default" {...rest}>
-      <Headline
-        className="!p-0"
-        title={title}
-        description={description}
-        align={align}
-        headlineVersion="M"
-        as="h2"
-      />
-      {documents?.length ? (
-        <div className={style('mt-8 flex gap-6', linkColumnsModeStyleMap[columnsMode])} role="list">
-          {documents.map((doc, i) => (
-            <div
-              key={String(i)}
-              className={columnsMode === 'double' ? 'basis-[calc(50%-20px)]' : ''}
-              role="listitem"
-            >
-              <LinkDocsListItem
-                doc={doc}
-                icon={
-                  icon ? (
-                    <Img className="min-w-6 min-h-6" image={icon} width="24" height="24" />
-                  ) : null
-                }
-              ></LinkDocsListItem>
-            </div>
-          ))}
-        </div>
-      ) : null}
-    </BlockWrapper>
-  ),
+  }) => {
+    const router = useRouter();
+
+    return (
+      <BlockWrapper className={className} defaultPadding="p-default" {...rest}>
+        <Headline
+          className="!p-0"
+          title={title}
+          description={description}
+          align={align}
+          headlineVersion="M"
+          as="h2"
+        />
+        {documents?.length ? (
+          <div
+            className={style(
+              'mt-5 sm:mt-8 flex flex-col gap-6',
+              linkColumnsModeStyleMap[columnsMode],
+            )}
+            role="list"
+          >
+            {documents.map(renderLinkDocItem(router, columnsMode, icon))}
+          </div>
+        ) : null}
+      </BlockWrapper>
+    );
+  },
 );
+
+const renderLinkDocItem =
+  (router: Router, columnsMode: LinkColumnsMode, icon: Picture) =>
+  (docBlockDef: DocBlockDef, i: number) => {
+    const href =
+      docBlockDef?.docType === 'Attachment'
+        ? adjustHref(router)(docBlockDef?.attachment?.src)
+        : docBlockDef?.href;
+
+    return (
+      <div
+        key={String(i)}
+        className={columnsMode === 'double' ? 'basis-[calc(50%-20px)]' : ''}
+        role="listitem"
+      >
+        <LinkDocItem
+          {...docBlockDef}
+          href={href}
+          icon={icon ? <Img className={linkIconStyle} image={icon} width="24" height="24" /> : null}
+        />
+      </div>
+    );
+  };

package/src/components/LinkDocs/LinkDocs.ui.json

@@ -2,7 +2,14 @@
   "content": {
     "documents": {
       "items": {
-        "ui:field": "document"
+        "docType": {
+          "ui:widget": "hidden"
+        },
+        "attachment": {
+          "src": {
+            "ui:widget": "FileWidget"
+          }
+        }
       }
     }
   }

package/src/components/LinkDocs/LinkDocsContent.ts

@@ -1,6 +1,8 @@
+import { Attachment } from '../../model/Attachment';
+import { EmptyOption } from '../../model/EmptyOptionType';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
-import type { LinkProps } from '../../model/LinkProps';
+import type { LinkProps, Target } from '../../model/LinkProps';
 import type { IconProps } from '../../model/Picture';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
 
@@ -13,14 +15,40 @@ import type { TextAlign } from '../../ui-kit/Text/TextProps';
  */
 export type LinkColumnsMode = 'single' | 'double';
 
-/**
- * @title Элемент списка
- */
-export interface LinkDocsItem extends LinkProps {
+export interface LinkDoc extends LinkProps {
   /** @title размер файла */
   fileSize?: string;
 }
 
+export interface AttachmentDoc {
+  /** @title Текст */
+  text?: string;
+  /** @title */
+  attachment?: Attachment;
+  /** @title размер файла */
+  fileSize?: string;
+  /** @default "" */
+  target?: Target;
+}
+
+/**
+ * @title Ссылка на документ
+ * @default {"docType": "Link"}
+ */
+export type LinkDocDef = LinkDoc & {
+  docType: 'Link';
+};
+
+/**
+ * @title Файл
+ * @default {"docType": "Attachment"}
+ */
+export type AttachmentDocDef = AttachmentDoc & {
+  docType: 'Attachment';
+};
+
+export type DocBlockDef = EmptyOption | LinkDocDef | AttachmentDocDef;
+
 /**
  * @title Список документов
  */
@@ -28,7 +56,7 @@ export type LinkDocsContent = UniBlockContent &
   HeadlineCommonProps &
   IconProps & {
     /** @title Список */
-    documents?: LinkDocsItem[];
+    documents?: DocBlockDef[];
     columnsMode?: LinkColumnsMode;
     /** @title Выравнивание */
     align?: TextAlign;

package/src/components/LinkDocs/linkDocsContentExample.ts

@@ -4,20 +4,32 @@ export const linkDocsContentExample: LinkDocsContent = {
   title: 'Дополнительные документы',
   description: 'Ответы на часто задаваемые вопросы',
   documents: [
-    { text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
-    { text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
-    { text: 'GlassIcon', href: '/abc3/map.jpeg' },
-    { text: 'no icon', href: '/abc4' },
-    { text: 'документ 5', href: '/abc5' },
-    { text: 'документ 6', href: '/abc6/abc.pdf' },
-    { text: 'Text text text', href: '/abc7/yolo.png' },
     {
+      docType: 'Attachment',
+      text: 'target self',
+      attachment: { src: '/abc1/cooldoc.doc' },
+      target: '_self',
+    },
+    { docType: 'Link', text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
+    { docType: 'Link', text: 'GlassIcon', href: '/abc3/map.jpeg' },
+    { docType: 'Link', text: 'no icon', href: '/abc4' },
+    { docType: 'Link', text: 'документ 5', href: '/abc5' },
+    { docType: 'Link', text: 'документ 6', href: '/abc6/abc.pdf' },
+    { docType: 'Link', text: 'Text text text', href: '/abc7/yolo.png' },
+    {
+      docType: 'Link',
       text: 'Some more generic text to stretch item, and even more, more text, and more generic text, and even more, more text, and even more',
       href: '/abc8/archive.zip',
       fileSize: '2.3МБ',
     },
-    { text: 'И ещё немного текста', href: '/abc9/rarniw.rar', fileSize: '666МБ' },
     {
+      docType: 'Link',
+      text: 'И ещё немного текста',
+      href: '/abc9/rarniw.rar',
+      fileSize: '666МБ',
+    },
+    {
+      docType: 'Link',
       text: 'Форматируем, сортируем, смотрим как отображается...',
       href: '/abc10/',
       fileSize: '65ГБ',

package/src/components/LinkDocs/linkIconStyle.mobile.ts

@@ -0,0 +1 @@
+export const linkIconStyle = 'min-w-11 min-h-11 h-fit p-2.5 bg-main-divider rounded-md';

package/src/components/LinkDocs/linkIconStyle.ts

@@ -0,0 +1 @@
+export const linkIconStyle = 'min-w-6 min-h-6';

package/src/components/MobileAppTile/renderList.tsx

@@ -2,9 +2,9 @@ import { List } from '../../ui-kit/List/List';
 
 export const renderList = (items?: string[]) => {
   return items?.length ? (
-    <List items={items} className="text-l-light mb-2 last:mb-0" />
+    <List items={items} className="text-l font-light mb-2 last:mb-0" />
   ) : (
-    <span className="text-m-light text-secondary-text">
+    <span className="text-m font-light text-secondary-text">
       Наведите камеру телефона на QR-код и скачайте приложение
     </span>
   );

package/src/components/OfficeMap/OfficeMap.tsx

@@ -57,7 +57,7 @@ export const OfficeMap = JSX<UniBlockProps>(({ className = '' }) => {
           <div className="text-h2">{name}</div>
           {renderCurrentDaySchedule(currentWeekDay)}
         </div>
-        <div className="flex text-l-light pt-4">
+        <div className="flex text-l font-light pt-4">
           <Icon name="GeolocationIcon" width="24" height="24" className="pr-1" />
           {address}
         </div>

package/src/components/OfficeMap/renderFunctions.tsx

@@ -1,4 +1,5 @@
 import { Icon } from '../../ui-kit/Icon/Icon';
+import { Text } from '../../ui-kit/Text/Text';
 import { NearbyOffices, WorkScheduleWeek } from './OfficeMapContent';
 
 export const renderCurrentDaySchedule = ({ lunchHour, status, workTime }: WorkScheduleWeek) => {
@@ -29,11 +30,11 @@ export const renderNearbyOffice = (
 ) => (
   <div className="flex mr-4" key={`nearbyOffice${index}`}>
     <Icon name={icon} width="16" height="16" className="mr-1" />
-    {title ? <span className="text-m">{title}&nbsp;</span> : null}
-    <span className="text-m-light">
+    {title ? <Text size="text-m">{title}&nbsp;</Text> : null}
+    <Text size="text-m" font="font-light">
       {distance ? ` (${distance})` : null}
       {time ? `, ${time}` : null}
-    </span>
+    </Text>
   </div>
 );
 export const renderDay = (
@@ -46,12 +47,12 @@ export const renderDay = (
   >
     <div className="flex justify-between items-center w-full pb-1 text-l text-primary-text">
       <div>{title}</div>
-      {status ? null : <div className="text-m-light text-error">Выходной</div>}
+      {status ? null : <div className="text-m font-light text-error">Выходной</div>}
       {status && workTime ? <div>{workTime}</div> : null}
     </div>
     {status && lunchHour ? renderLunchHour(lunchHour) : null}
     {description ? (
-      <div className="pb-1 text-s-light text-secondary-text">{description}</div>
+      <div className="pb-1 text-s font-light text-secondary-text">{description}</div>
     ) : null}
   </div>
 );
@@ -60,12 +61,12 @@ const renderLunchHour = (lunchHour: string) => {
   const hasTime = /\d+/gi.test(lunchHour);
 
   return hasTime ? (
-    <div className="flex justify-between items-center w-full pb-1 text-m-light text-error">
+    <div className="flex justify-between items-center w-full pb-1 text-m font-light text-error">
       <div>Перерыв</div>
       <div>{lunchHour}</div>
     </div>
   ) : (
-    <div className="flex justify-between items-center w-full pb-1 text-m-light text-primary-main">
+    <div className="flex justify-between items-center w-full pb-1 text-m font-light text-primary-main">
       <div>{lunchHour}</div>
     </div>
   );

package/src/components/OfficeServicesBlock/OfficeServicesBlock.tsx

@@ -3,6 +3,7 @@ import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
+import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
 import type {
   OfficeServicesBlockContent,
@@ -27,6 +28,10 @@ const renderListItems = (itemList: OfficeServicesBlockList, i: number) => (
     {itemList.icon ? (
       <Img className="mr-3 min-w-6 min-h-6 w-6 h-6" width="24" height="24" image={itemList.icon} />
     ) : null}
-    {itemList.label ? <span className="text-l-light">{itemList.label}</span> : null}
+    {itemList.label ? (
+      <Text size="text-l" font="font-light">
+        {itemList.label}
+      </Text>
+    ) : null}
   </li>
 );

package/src/components/ProductGallery/ProductGallery.tsx

@@ -59,8 +59,8 @@ const renderNavButton =
       ? 'text-primary-text text-h6 py-2'
       : 'text-l pb-1 text-secondary-text group-data-secondary:text-white';
     const btnDescClassName = isActive
-      ? 'text-secondary-text text-l-light'
-      : 'text-m-light text-secondary-text group-data-secondary:text-white/80';
+      ? 'text-secondary-text text-l font-light'
+      : 'text-secondary-text text-m font-light group-data-secondary:text-white/80';
 
     return (
       <button

package/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfo.tsx

@@ -66,7 +66,9 @@ const renderBlock = (blockName: string, data?: string, iconName?: IconName | und
   <div className="flex mb-4">
     <Icon className="pr-4" iconVersion="black" name={iconName} width="24" height="24" />
     <div className="flex flex-col first:pb-1">
-      <Text size="text-m-light">{blockName}</Text>
+      <Text size="text-m" font="font-light">
+        {blockName}
+      </Text>
       {data ? (
         <Text size="text-h6" color="text-green">
           {data}

package/src/components/SafeDepositRental/RentalPeriod.tsx

@@ -12,7 +12,7 @@ interface RentalPeriodProps {
 
 export const RentalPeriod = JSX<RentalPeriodProps>(({ days, setDays }) => (
   <div className="mb-6">
-    <span className="block text-m-light mb-[3px]">Срок аренды</span>
+    <span className="block text-m font-light mb-1">Срок аренды</span>
     <InputRange min={MIN} max={MAX} value={days} items={ITEMS} onChange={setDays} />
   </div>
 ));

package/src/components/SafeDepositRental/SafeDepositRental.tsx

@@ -10,6 +10,7 @@ import { HandleFormStateChange, SafeDepositRentalState } from './SafeDepositRent
 import { Region, useGetRegions } from './useGetRegions';
 import { useSafeBoxes } from './useSafeBoxes';
 import { getBranch, getCoordinates } from './utils';
+import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
 
 export interface SafeDepositRentalProps extends SafeDepositRentalContent, UniBlockProps {}
 
@@ -58,7 +59,11 @@ export const SafeDepositRental = JSX<SafeDepositRentalProps>(
             onClick={handleShowMap}
             onChange={handleChangeSafeDepositState}
           />
-          {footnote ? <p className="text-s-light text-secondary-text">{footnote}</p> : null}
+          {footnote ? (
+            <Paragraph size="text-s" font="font-light">
+              {footnote}
+            </Paragraph>
+          ) : null}
         </div>
         {points.length && showMap ? <YandexMap points={points} className="h-[640px]" /> : null}
       </BlockWrapper>

package/src/components/SafeDepositRental/SafeDepositRentalFields.tsx

@@ -4,6 +4,7 @@ import { RegionsAndBranches } from './RegionsAndBranches';
 import { RenderRadioButtons } from './RenderRadioButtons';
 import { RentalPeriod } from './RentalPeriod';
 import { SafeBoxCases } from './SafeBoxCases';
+import { Text } from '../../ui-kit/Text/Text';
 import type { HandleFormStateChange, SafeDepositRentalState } from './SafeDepositRentalTypes';
 import type { Region } from './useGetRegions';
 import type { Branch, SafeBoxCase, SafeBoxCaseVolume } from './useSafeBoxes';
@@ -50,7 +51,9 @@ export const SafeDepositRentalFields = JSX<SafeDepositRentalFieldsProps>(
           selectedBoxSize={selectedBoxSize}
           onSelectedBoxSize={(value) => onChange({ selectedBoxSize: value })}
         />
-        <span className="text-secondary-text text-l-light">Тип договора</span>
+        <Text size="text-l" font="font-light" color="text-secondary-text">
+          Тип договора
+        </Text>
         <div className="flex justify-between items-center mt-5">
           <RenderRadioButtons />
           <Button text="Офисы на карте" version="primary" onClick={onClick} />

package/src/components/SafeDepositRental/SafeDepositRentalTotal.tsx

@@ -19,7 +19,7 @@ export const SafeDepositRentalTotal = JSX<SafeDepositRentalTotalProps>(({ days,
       <div className="bg-primary-main px-10 pt-10 pb-4 text-center">
         <Img image={{ icon: 'PackA4Icon' }} width="290" height="257" />
 
-        <span className="text-s-light text-white opacity-80 mt-2 inline-block">
+        <span className="text-s font-light text-white opacity-80 mt-2 inline-block">
           На рисунки изображена пачка<br></br> листов формата А4
         </span>
       </div>
@@ -30,7 +30,7 @@ export const SafeDepositRentalTotal = JSX<SafeDepositRentalTotalProps>(({ days,
 const renderTotal = (label: string, total: string | number, className = '') => {
   return (
     <div className={className}>
-      <div className="text-m-light text-secondary-text mb-1">{label}</div>
+      <div className="text-m font-light text-secondary-text mb-1">{label}</div>
       <span className="text-h3 text-primary-text">{total}</span>
     </div>
   );

package/src/components/StepsBlock/StepsBlockStyleMaps.ts

@@ -8,7 +8,7 @@ export type StyleType = {
 
 export const STEPS_BLOCK_STYLE: StyleType = {
   description:
-    'text-white/80 text-l-light group-data-primary:text-secondary-text group-data-gray:text-secondary-text',
+    'text-white/80 text-l font-light group-data-primary:text-secondary-text group-data-gray:text-secondary-text',
   iconText: 'text-white group-data-primary:text-secondary-text group-data-gray:text-secondary-text',
   iconBackground: 'bg-white/30 group-data-primary:bg-main-divider',
   iconConnector: 'bg-white group-data-primary:bg-secondary-light',

package/src/components/TariffsTable/EmbeddableCellData.tsx

@@ -32,7 +32,9 @@ const renderLabelDescriptionCellData = ({ label, description }: LabelDescription
   return (
     <div>
       {label ? <div className={labelClassName}>{label}</div> : null}
-      {description ? <div className="text-secondary-text text-l-light">{description}</div> : null}
+      {description ? (
+        <div className="text-secondary-text text-l font-light">{description}</div>
+      ) : null}
     </div>
   );
 };

package/src/components/TariffsTable/TableTileHeader.tsx

@@ -5,7 +5,11 @@ import type { TariffsTableRowHeader } from './TariffsTableContent';
 
 export const TableTileHeader = JSX<TariffsTableRowHeader>(({ title, icon }) => (
   <div className="mb-2">
-    {title ? <Text size="text-l-light">{title}</Text> : null}
+    {title ? (
+      <Text size="text-l" font="font-light">
+        {title}
+      </Text>
+    ) : null}
     {icon ? <Img className="ml-auto min-w-6" image={icon} width="24" height="24" /> : null}
   </div>
 ));

package/src/components/TariffsTable/TariffsTableRow.tsx

@@ -40,7 +40,7 @@ export const TariffsTableRow = JSX<TariffsTableRowProps>(
             {header?.icon ? (
               <Img className="mr-3.5 max-w-6" image={header.icon} width="24" height="24" />
             ) : null}
-            {header?.title ? <div className="text-m-light">{header?.title}</div> : null}
+            {header?.title ? <div className="text-m font-light">{header?.title}</div> : null}
           </div>
         </div>
         {data?.length ? (

package/src/components/TextBlock/TextBlock.tsx

@@ -39,7 +39,7 @@ export const TextBlock = JSX<TextBlockProps>(
 
 const renderIcon = () => (
   <div
-    className={`rounded-full h-4 w-4 text-center text-xs-light bg-primary-main text-white group-data-secondary:bg-white group-data-secondary:text-primary-main`}
+    className={`rounded-full h-4 w-4 text-center text-xs font-light bg-primary-main text-white group-data-secondary:bg-white group-data-secondary:text-primary-main`}
   >
     i
   </div>

package/src/components/VerticalLayout/VerticalLayout.fixture.mobile.tsx

@@ -3,11 +3,11 @@ import '../../setup-fixture';
 import { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import type { Picture } from '../../model/Picture';
 import { Blocks } from '../Blocks';
+import type { LinkDocsContent } from '../LinkDocs/LinkDocsContent';
 import { PRODUCT_TILE } from '../ProductTile/ProductTile.fixture';
 import { RICH_TEXT_SEPARATOR } from '../RichTextBlock/RichTextBlock.fixture';
 import type { TextBlockContent } from '../TextBlock/TextBlockContent';
 import { VerticalLayout } from './VerticalLayout';
-import type { LinkDocsContent } from '../LinkDocs/LinkDocsContent';
 
 const options = {
   blocksRegistry: Blocks,
@@ -16,9 +16,9 @@ const options = {
 const linkDocsExample: LinkDocsContent = {
   description: 'Ответы на часто задаваемые вопросы',
   documents: [
-    { text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
-    { text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
-    { text: 'GlassIcon', href: '/abc3/map.jpeg' },
+    { docType: 'Link', text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
+    { docType: 'Link', text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
+    { docType: 'Link', text: 'GlassIcon', href: '/abc3/map.jpeg' },
   ],
 };
 

package/src/components/VerticalLayout/VerticalLayout.fixture.tsx

@@ -11,9 +11,9 @@ import { VerticalLayout } from './VerticalLayout';
 const linkDocsExample: LinkDocsContent = {
   description: 'Ответы на часто задаваемые вопросы',
   documents: [
-    { text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
-    { text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
-    { text: 'GlassIcon', href: '/abc3/map.jpeg' },
+    { docType: 'Link', text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
+    { docType: 'Link', text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
+    { docType: 'Link', text: 'GlassIcon', href: '/abc3/map.jpeg' },
   ],
 };
 

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

@@ -1,12 +1,12 @@
 import fs from 'fs';
 import path from 'path';
 import util from 'util';
+import { Attachment } from '../model/Attachment';
 import type { ContentPageDef } from '../model/ContentPageDef';
-import { LinkProps } from '../model/LinkProps';
 import type { Picture } from '../model/Picture';
 import { mapJSON } from './mapJSON';
 import type { TransformationOptions } from './TransformationOptions';
-import { transformDocumentLink } from './transformDocumentLink';
+import { transformDocument } from './transformDocument';
 import { transformHTML } from './transformHTML';
 import { transformMarkdown } from './transformMarkdown';
 import { transformPicture } from './transformPicture';
@@ -16,7 +16,17 @@ const writeFile = util.promisify(fs.writeFile);
 
 const OUTPUT_SUFFIX = '.static';
 
-const DOCUMENT_EXT_LIST = ['.txt', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.pdf'];
+const DOCUMENT_EXT_LIST = [
+  '.txt',
+  '.doc',
+  '.docx',
+  '.xls',
+  '.xlsx',
+  '.xlsb',
+  '.ppt',
+  '.pptx',
+  '.pdf',
+];
 
 export async function transformContentPage(
   pagePath: string,
@@ -31,8 +41,8 @@ export async function transformContentPage(
         return await transformMarkdown(value as string);
       } else if (isHTML(key, value)) {
         return await transformHTML(value as string);
-      } else if (isDocumentLink(value)) {
-        return await transformDocumentLink(value, pagePath, options);
+      } else if (isDocument(value)) {
+        return await transformDocument(value, pagePath, options);
       } else if (isPicture(value)) {
         return await transformPicture(value, pagePath, options);
       }
@@ -55,8 +65,8 @@ const isMarkdown = (key: string, value: any): value is string =>
   isString(value) && key?.endsWith('__md');
 const isHTML = (key: string, value: any): value is string =>
   isString(value) && key?.endsWith('__html');
-const isDocumentLink = (_: any): _ is LinkProps =>
-  Boolean(_ && isLocalPath(_?.href) && isDocumentExt(path.extname(_?.href as string)));
+const isDocument = (_: any): _ is Attachment =>
+  Boolean(_ && isLocalPath(_?.src) && isDocumentExt(path.extname(_?.src as string)));
 const isDocumentExt = (input: string) =>
   DOCUMENT_EXT_LIST.some((ext) => input.toLowerCase().endsWith(ext));
 const isPicture = (_: any): _ is Picture => Boolean(_ && isLocalPath(_?.src));

package/{mobile/src/content-page-repository/transformDocumentLink.ts → src/content-page-repository/transformDocument.ts}

@@ -1,22 +1,22 @@
 import fs from 'fs';
 import path from 'path';
 import util from 'util';
-import type { LinkProps } from '../model/LinkProps';
+import { Attachment } from '../model/Attachment';
 import type { TransformationOptions } from './TransformationOptions';
 
 const copyFile = util.promisify(fs.copyFile);
 
-export async function transformDocumentLink(
-  link: LinkProps,
+export async function transformDocument(
+  attachment: Attachment,
   pagePath: string,
   options: TransformationOptions,
-): Promise<LinkProps> {
-  if (!link?.href) {
-    return link;
+): Promise<Attachment> {
+  if (!attachment?.src) {
+    return attachment;
   }
 
   const { contentDir, publicDir } = options;
-  const input = path.join(path.dirname(pagePath), link.href);
+  const input = path.join(path.dirname(pagePath), attachment.src);
   const docRelativePath = path.relative(contentDir, input);
   const output = path.join(publicDir, docRelativePath);
 
@@ -25,13 +25,13 @@ export async function transformDocumentLink(
   } catch (e) {
     console.info(`No "${input}" attachment found on page: "${pagePath}"`);
 
-    return link;
+    return attachment;
   }
 
-  const href = path.join('/', docRelativePath);
+  const src = path.join('/', docRelativePath);
 
   return {
-    ...link,
-    href,
+    ...attachment,
+    src,
   };
 }