@redneckz/wildless-cms-uni-blocks 0.6.24 → 0.6.25

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

@@ -16,67 +16,49 @@ const not =
   (_: Arg) =>
     !predicate(_);
 
-export function ContentPageRepository({
-  contentDir = 'content',
-  publicDir = 'public',
-}: Partial<TransformationOptions> = {}) {
-  function listAllContentPages(): Promise<string[]> {
-    return find(`${contentDir}/**/*.page.json`);
-  }
+export class ContentPageRepository {
+  public static readonly inst = new ContentPageRepository();
+
+  private cache: Record<string, ContentPageDef> = {};
+
+  constructor(
+    private readonly options: TransformationOptions = {
+      contentDir: 'content',
+      publicDir: 'public',
+    },
+  ) {}
 
-  async function getAllContentPagesMap(): Promise<Record<string, ContentPageDef>> {
-    const pagePaths = await listAllContentPages();
-    const pages = await Promise.all(pagePaths.map(readPage));
-
-    return pagePaths.reduce(
-      (result, path, i) => ({
-        ...result,
-        [path]: pages[i],
-      }),
-      {},
-    );
+  async listAllContentPages(): Promise<string[]> {
+    return find(`${this.options.contentDir}/**/*.page.json`);
   }
 
-  async function getAllContentPages(): Promise<ContentPageDef[]> {
-    return Object.values(await getAllContentPagesMap());
+  async getAllContentPages(): Promise<ContentPageDef[]> {
+    const pagePaths = await this.listAllContentPages();
+
+    return Promise.all(pagePaths.map((_) => this.readPage(_)));
   }
 
-  async function getSecondaryContentPages(customPageType?: string) {
-    const pages = await getAllContentPages();
+  async getSecondaryContentPages(customPageType?: string): Promise<ContentPageDef[]> {
+    const pages = await this.getAllContentPages();
 
     return pages.filter(not(bySlug(INDEX_PAGE_SLUG))).filter(byCustomPageType(customPageType));
   }
 
-  async function getContentPageBySlug(slug: string): Promise<ContentPageDef | undefined> {
-    const pages = await getAllContentPages();
+  async getContentPageBySlug(slug: string): Promise<ContentPageDef | undefined> {
+    const pages = await this.getAllContentPages();
 
     return pages.find(bySlug(slug));
   }
 
-  async function getIndexPage() {
-    return await getContentPageBySlug(INDEX_PAGE_SLUG);
+  async getIndexPage(): Promise<ContentPageDef | undefined> {
+    return this.getContentPageBySlug(INDEX_PAGE_SLUG);
   }
 
-  const cache: Record<string, ContentPageDef> = {};
-
-  async function readPage(filePath: string): Promise<ContentPageDef> {
-    if (!(filePath in cache)) {
-      cache[filePath] = await transformContentPage(filePath, {
-        contentDir,
-        publicDir,
-      });
+  async readPage(filePath: string): Promise<ContentPageDef> {
+    if (!(filePath in this.cache)) {
+      this.cache[filePath] = await transformContentPage(filePath, this.options);
     }
 
-    return cache[filePath];
+    return this.cache[filePath];
   }
-
-  return {
-    listAllContentPages,
-    getAllContentPagesMap,
-    getAllContentPages,
-    getContentPageBySlug,
-    getSecondaryContentPages,
-    getIndexPage,
-    readPage,
-  };
 }

package/src/model/BorderVersion.ts

@@ -0,0 +1,10 @@
+/**
+ * @title Цвет бордера
+ * @enumNames ["Основной", "Второстепенный"]
+ */
+export type BorderVersion = 'primary' | 'secondary';
+
+export const BorderVersionStyleMap: Record<BorderVersion, string> = {
+  primary: 'border-main-stroke',
+  secondary: 'border-white/50',
+};

package/src/services/sitemap/useSitemap.ts

@@ -1,11 +1,11 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
-import type { HeaderContent } from '../../components/Header/HeaderContent';
-import { projectSettings } from '../../ProjectSettings';
 import type { Fallback } from '../../model/Fallback';
+import { projectSettings } from '../../ProjectSettings';
 import { fetchJSONUnsafe } from '../../utils/fetchJSON';
+import type { SitemapProps } from './SitemapProps';
 
-export function useSitemap(fallback: Fallback = {}): HeaderContent {
-  const { data } = useAsyncData<HeaderContent>(
+export function useSitemap(fallback: Fallback = {}): SitemapProps {
+  const { data } = useAsyncData<SitemapProps>(
     `/wcms-resources/${projectSettings.SITEMAP || 'sitemap'}.json`,
     fetchJSONUnsafe,
     { fallback },

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

@@ -1,21 +1,22 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { IconVersion } from '../../model/IconVersion';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { Img } from '../Img/Img';
 import type { BenefitItemCommonProps, BenefitItemProps } from './BenefitItemProps';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
-
-export interface BenefitGeneralProps extends BenefitItemProps, BenefitItemCommonProps {}
 
 const titleStyleMap: Record<BlockVersion, string> = {
   primary: 'text-primary-text',
   secondary: 'text-white',
 };
+
 const descStyleMap: Record<BlockVersion, string> = {
   primary: 'text-secondary-text',
   secondary: 'text-white',
 };
 
+export interface BenefitGeneralProps extends BenefitItemProps, BenefitItemCommonProps {}
+
 export const BenefitItem = JSX<BenefitGeneralProps>((props) => {
   const {
     className = '',
@@ -31,7 +32,7 @@ export const BenefitItem = JSX<BenefitGeneralProps>((props) => {
   return (
     <div className={`flex gap-5 ${listItemAlign} ${className}`}>
       {icon ? (
-        <div className={renderBenefitIconBgStyle(version, benefitsVersion)}>
+        <div className={getBenefitIconBgStyle(version, benefitsVersion)}>
           <Img className="w-6 h-6" image={getIconWithVersion(icon, calcVersion)} asSVG />
         </div>
       ) : null}
@@ -45,7 +46,7 @@ export const BenefitItem = JSX<BenefitGeneralProps>((props) => {
   );
 });
 
-function renderBenefitIconBgStyle(version: BlockVersion, benefitsVersion: IconVersion) {
+function getBenefitIconBgStyle(version: BlockVersion, benefitsVersion: IconVersion) {
   let bgColorStyle = 'bg-primary-main text-black';
 
   if (version === 'secondary') {

package/src/ui-kit/Breadcrumb.tsx

@@ -7,15 +7,12 @@ export interface BreadcrumbProps extends LinkProps {
 }
 
 export const Breadcrumb = JSX<BreadcrumbProps>(
-  ({ text, href, target, onClick, className = '', children }) => {
-    if (href) {
-      return (
-        <a className={`no-underline ${className}`} href={href} target={target} onClick={onClick}>
-          <span className={className}>{text || children}</span>
-        </a>
-      );
-    } else {
-      return <span className={className}>{text || children}</span>;
-    }
-  },
+  ({ text, href, target, onClick, className = '', children }) =>
+    href ? (
+      <a className={`no-underline ${className}`} href={href} target={target} onClick={onClick}>
+        <span className={className}>{text || children}</span>
+      </a>
+    ) : (
+      <span className={className}>{text || children}</span>
+    ),
 );

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { clamp } from '../../utils/clamp';
-import { adjustValue, localNumberFormat } from './adjustValue ';
+import { adjustValue, localNumberFormat } from './adjustValue';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { Input } from '../Input/Input';
 import type { CurrencyInputProps } from './CurrencyInputProps';

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

@@ -10,15 +10,13 @@ export const Tags = JSX<TagsProps>((props) => {
   const { tags, className = '' } = props;
 
   return tags?.length ? (
-    <div className={`flex flex-wrap gap-2 ${className}`}>
-      {tags.map((_, i) => renderTag(_, String(i)))}
-    </div>
+    <div className={`flex flex-wrap gap-2 ${className}`}>{tags.map(renderTag)}</div>
   ) : null;
 });
 
-const renderTag = (tag: string, key: string) => (
+const renderTag = (tag: string, key: number) => (
   <span
-    key={key}
+    key={String(key)}
     className="text-m-light py-2 px-2.5 border-solid border rounded-md border-color-stroke"
   >
     {tag}

package/dist/ui-kit/CurrencyInput/adjustValue .js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adjustValue .js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/adjustValue .ts"],"names":[],"mappings":";;AAAA,qEAAkE;AAE3D,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE,CACzC,IAAA,kBAAU,EAAC,YAAY,CAAC,iBAAiB,CAAC,IAAA,qCAAiB,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AADzD,QAAA,WAAW,eAC8C;AAE/D,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CACvD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC7B,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CAAC;KACC,MAAM,CAAC,MAAM,CAAC,IAAA,qCAAiB,EAAC,GAAG,CAAC,CAAC,CAAC;KACtC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AANV,QAAA,iBAAiB,qBAMP;AAEhB,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE;IAChD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAEvC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACvE,CAAC,CAAC;AAJW,QAAA,UAAU,cAIrB;AAEF,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAE1D,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CAChD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC"}

package/lib/ui-kit/CurrencyInput/adjustValue .js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adjustValue .js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/adjustValue .ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE,CACzC,UAAU,CAAC,YAAY,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CACvD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC7B,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CAAC;KACC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;KACtC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEvB,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE;IAChD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAEvC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACvE,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAE1D,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CAChD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC"}

package/mobile/dist/ui-kit/CurrencyInput/adjustValue .js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adjustValue .js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/adjustValue .ts"],"names":[],"mappings":";;AAAA,qEAAkE;AAE3D,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE,CACzC,IAAA,kBAAU,EAAC,YAAY,CAAC,iBAAiB,CAAC,IAAA,qCAAiB,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AADzD,QAAA,WAAW,eAC8C;AAE/D,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CACvD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC7B,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CAAC;KACC,MAAM,CAAC,MAAM,CAAC,IAAA,qCAAiB,EAAC,GAAG,CAAC,CAAC,CAAC;KACtC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AANV,QAAA,iBAAiB,qBAMP;AAEhB,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE;IAChD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAEvC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACvE,CAAC,CAAC;AAJW,QAAA,UAAU,cAIrB;AAEF,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAE1D,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CAChD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC"}

package/mobile/lib/ui-kit/CurrencyInput/adjustValue .js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adjustValue .js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/adjustValue .ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE,CACzC,UAAU,CAAC,YAAY,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CACvD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC7B,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CAAC;KACC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;KACtC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEvB,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE;IAChD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAEvC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACvE,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAE1D,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CAChD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC"}