@redneckz/wildless-cms-uni-blocks 0.14.102 → 0.14.103

package/mobile/src/hooks/useLocation.ts

@@ -2,7 +2,7 @@ import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { defaultEventBus } from '../EventBus/defaultEventBus';
 import { useLatestEvent } from '../EventBus/useLatestEvent';
-import { fetchJSONUnsafe } from '../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 
 const REGION_URL = '/api/v1/region';
 
@@ -26,7 +26,10 @@ export function useLocation(defaultLocation = 'Москва'): [RegionData, (_:
     fireCurrentLocation(_);
   }, []);
 
-  const { data } = useAsyncData<RegionData>(REGION_URL, fetchJSONUnsafe);
+  const { data } = useAsyncData(
+    hasStoredLocation() ? null : REGION_URL,
+    fetchJSONUnsafe as FetchJSONUnsafeType<RegionData>,
+  );
   useEffect(() => {
     if (data && !hasStoredLocation()) {
       fireCurrentLocation(data);

package/mobile/src/hooks/useRegions.ts

@@ -1,5 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
-import { fetchJSONUnsafe } from '../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 
 const REGIONS_URL = '/api/v1/regions';
 
@@ -10,7 +10,7 @@ export interface Region {
 }
 
 export function useRegions(): Region[] {
-  const { data } = useAsyncData<Region[]>(REGIONS_URL, fetchJSONUnsafe);
+  const { data } = useAsyncData(REGIONS_URL, fetchJSONUnsafe as FetchJSONUnsafeType<Region[]>);
 
   return data || [];
 }

package/mobile/src/hooks/useSWRResource.ts

@@ -1,7 +1,7 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { type Fallback } from '../model/Fallback';
 import { projectSettings } from '../ProjectSettings';
-import { fetchJSONUnsafe } from '../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 import { joinPath } from '../utils/url';
 
 const EMPTY_VALUE = {};
@@ -26,9 +26,13 @@ export function useSWRResource<Data>(
     `${filename}.json`,
   );
 
-  const { data } = useAsyncData<Data, any, string | null>(filename ? path : null, fetchJSONUnsafe, {
-    fallback,
-  });
+  const { data } = useAsyncData(
+    filename ? path : null,
+    fetchJSONUnsafe as FetchJSONUnsafeType<Data>,
+    {
+      fallback,
+    },
+  );
 
   return data || (EMPTY_VALUE as Data);
 }

package/mobile/src/utils/fetchJSON.ts

@@ -1,7 +1,4 @@
-export async function fetchJSON<R = unknown>(
-  url: string,
-  options?: RequestInit,
-): Promise<R | null> {
+export async function fetchJSON<R = any>(url: string, options?: RequestInit): Promise<R | null> {
   try {
     return url ? await fetchJSONUnsafe(url, options) : null;
   } catch (err) {
@@ -11,7 +8,9 @@ export async function fetchJSON<R = unknown>(
   return null;
 }
 
-export async function fetchJSONUnsafe<R = unknown>(url: string, options?: RequestInit): Promise<R> {
+export type FetchJSONUnsafeType<R> = (url: string, options?: RequestInit) => Promise<R>;
+
+export const fetchJSONUnsafe: FetchJSONUnsafeType<any> = async (url, options) => {
   const response = await fetch(url, {
     ...options,
     headers: {
@@ -21,4 +20,4 @@ export async function fetchJSONUnsafe<R = unknown>(url: string, options?: Reques
   });
 
   return response.json();
-}
+};

package/mobile/src/utils/fetchMultitudeJSON.ts

@@ -1,9 +1,9 @@
 import { fetchJSON } from './fetchJSON';
 
-export async function fetchMultitudeJSON<R = unknown>(
-  ...urls: string[]
-): Promise<Awaited<R | null>[]> {
-  const fetchPromises = urls.map((url) => fetchJSON<R>(url));
+export type FetchMultitudeJSONType<R> = (...urls: string[]) => Promise<Awaited<R | null>[]>;
+
+export const fetchMultitudeJSON: FetchMultitudeJSONType<any> = (...urls) => {
+  const fetchPromises = urls.map((url) => fetchJSON(url));
 
   return Promise.all(fetchPromises);
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.102",
+  "version": "0.14.103",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -133,7 +133,7 @@
   },
   "dependencies": {
     "@redneckz/json-ref": "^0.0.2",
-    "@redneckz/uni-jsx": "^2.6.0",
+    "@redneckz/uni-jsx": "^2.6.2",
     "@tailwindcss/container-queries": "^0.1.0",
     "@types/json-schema": "^7.0.11",
     "glob": "^8.0.3",

package/src/components/Calculator/useCalculatorParams.ts

@@ -1,8 +1,11 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
-import { fetchJSONUnsafe } from '../../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../../utils/fetchJSON';
 
 export function useCalculatorParams<Data>(dir: string) {
-  const { data } = useAsyncData<Data>(`/wcms-resources/${dir}.json`, fetchJSONUnsafe);
+  const { data } = useAsyncData(
+    `/wcms-resources/${dir}.json`,
+    fetchJSONUnsafe as FetchJSONUnsafeType<Data>,
+  );
 
   return data;
 }

package/src/components/DepositFiltration/getPeriod.ts

@@ -2,9 +2,14 @@ export interface SourceItem {
   rateRows: Array<{ minMonths?: number; maxMonths?: number }>;
 }
 
-type Source = Record<string, SourceItem>;
+type Source = Record<string, SourceItem | null>;
 
-export const getPeriod = (source: Source, content: Record<string, any>): number[] =>
-  source[content?.sourceBook]?.rateRows
-    .map((el) => el.minMonths)
-    .filter((minMonths): minMonths is number => minMonths !== undefined);
+export const getPeriod = (source: Source, content: Record<string, any>): number[] => {
+  const sourceItem = source[content?.sourceBook];
+
+  return sourceItem
+    ? sourceItem?.rateRows
+        .map((el) => el.minMonths)
+        .filter((minMonths): minMonths is number => minMonths !== undefined)
+    : [];
+};

package/src/components/DepositFiltration/useDepositsPeriods.ts

@@ -1,7 +1,7 @@
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { type BlockDef } from '../../model/ContentPageDef';
-import { fetchMultitudeJSON } from '../../utils/fetchMultitudeJSON';
+import { fetchMultitudeJSON, type FetchMultitudeJSONType } from '../../utils/fetchMultitudeJSON';
 import { unique } from '../../utils/unique';
 import { zip } from '../../utils/zip';
 import { getChildSourceBook } from './getChildSourceBook';
@@ -14,15 +14,13 @@ export function useDepositsPeriods(blocks: BlockDef[] | undefined) {
     return { dirs: sourceBooks?.map((url) => `/wcms-resources/${url}.json`), source: sourceBooks };
   }, [blocks]);
 
-  const { data = [] } = useAsyncData<(SourceItem | null)[], any, string[]>(
+  const { data = [] } = useAsyncData(
     dirs,
-    fetchMultitudeJSON,
+    fetchMultitudeJSON as FetchMultitudeJSONType<SourceItem>,
   );
 
   return {
-    source: Object.fromEntries(
-      zip(source, data as SourceItem[]).filter(([, sourceData]) => Boolean(sourceData)),
-    ),
+    source: Object.fromEntries(zip(source, data).filter(([, sourceData]) => Boolean(sourceData))),
     months:
       unique(
         data

package/src/components/Depository/useDepository.ts

@@ -1,5 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
-import { fetchJSONUnsafe } from '../../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../../utils/fetchJSON';
 import { formatDate } from '../../utils/formatDate';
 import { type DepositoryFiltrationState } from './Depository';
 
@@ -35,7 +35,10 @@ export const useDepository = ({ size, page, query, startDate, endDate }: UseDepo
 
   const queryString = `?${searchParams.toString()}`;
 
-  const { data } = useAsyncData<DepositoryData>(DEPOSITARY_URL + queryString, fetchJSONUnsafe);
+  const { data } = useAsyncData(
+    DEPOSITARY_URL + queryString,
+    fetchJSONUnsafe as FetchJSONUnsafeType<DepositoryData>,
+  );
 
   return { items: data?.content, totalPages: data?.totalPages };
 };

package/src/components/ExchangeRateTile/useFetchExchangeRateData.ts

@@ -1,7 +1,7 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
 import { type RegionData } from '../../hooks/useLocation';
-import { fetchJSONUnsafe } from '../../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../../utils/fetchJSON';
 
 export interface ExchangeData {
   exchangeRate?: {
@@ -15,9 +15,9 @@ const EXCHANGE_RATES_URL = '/api/v1/exchangerates';
 export function useFetchExchangeRateData(currentRegion: RegionData) {
   const regionCode = currentRegion?.code || '000';
 
-  const { data } = useAsyncData<ExchangeData>(
+  const { data } = useAsyncData(
     EXCHANGE_RATES_URL + `?regionCode=${regionCode}`,
-    fetchJSONUnsafe,
+    fetchJSONUnsafe as FetchJSONUnsafeType<ExchangeData>,
   );
 
   return data || {};

package/src/components/Footer/useFooterData.ts

@@ -1,12 +1,12 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { type FooterContent } from '../../components/Footer/FooterContent';
 import { projectSettings } from '../../ProjectSettings';
-import { fetchJSONUnsafe } from '../../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../../utils/fetchJSON';
 
 export function useFooterData(): FooterContent {
-  const { data } = useAsyncData<FooterContent>(
+  const { data } = useAsyncData(
     `/wcms-resources/${projectSettings.FOOTER || 'footer'}.json`,
-    fetchJSONUnsafe,
+    fetchJSONUnsafe as FetchJSONUnsafeType<FooterContent>,
   );
 
   return data || {};

package/src/components/OfficesAtmsMap/useAtms.ts

@@ -5,10 +5,7 @@ import { type Atm } from './OfficesAtmsMapProps';
 const EMPTY_VALUE = [];
 
 export function useAtms(regionCode?: string) {
-  const { data = EMPTY_VALUE } = useAsyncData<Atm[], any, string | null>(
-    `/api/v1/atms?regionCode=${regionCode}`,
-    fetchMap,
-  );
+  const { data = EMPTY_VALUE } = useAsyncData(`/api/v1/atms?regionCode=${regionCode}`, fetchMap);
 
   return data;
 }

package/src/components/OfficesAtmsMap/useOffices.ts

@@ -5,7 +5,7 @@ import { type Branch } from './OfficesAtmsMapProps';
 const EMPTY_VALUE = [];
 
 export function useOffices(regionCode?: string) {
-  const { data = EMPTY_VALUE } = useAsyncData<Branch[], any, string | null>(
+  const { data = EMPTY_VALUE } = useAsyncData(
     `/api/v1/branches?regionCode=${regionCode}`,
     fetchMap,
   );

package/src/components/SafeDepositRental/useGetRegions.ts

@@ -1,5 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
-import { fetchJSONUnsafe } from '../../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../../utils/fetchJSON';
 
 const REGIONS_URL = '/api/v1/regions';
 
@@ -12,7 +12,7 @@ export interface Region {
 const EMPTY_VALUE = [];
 
 export function useGetRegions(): Region[] {
-  const { data } = useAsyncData<Region[]>(REGIONS_URL, fetchJSONUnsafe);
+  const { data } = useAsyncData(REGIONS_URL, fetchJSONUnsafe as FetchJSONUnsafeType<Region[]>);
 
   return data || EMPTY_VALUE;
 }

package/src/components/SafeDepositRental/useSafeBoxes.ts

@@ -28,7 +28,7 @@ const SAFEBOXES_URL = '/api/v1/safeboxes';
 const EMPTY_VALUE = [];
 
 export function useSafeBoxes(regionCode?: string): Branch[] {
-  const { data } = useAsyncData<Branch[], any, string | null>(
+  const { data } = useAsyncData(
     regionCode ? `${SAFEBOXES_URL}?regionCode=${regionCode}` : null,
     fetchSafeBoxes,
   );

package/src/hooks/useBranches.ts

@@ -28,7 +28,7 @@ const BRANCHES_URL = '/api/v1/branches';
 const EMPTY_VALUE = [];
 
 export function useBranches(regionCode?: string): Branch[] {
-  const { data } = useAsyncData<Branch[], any, string | null>(
+  const { data } = useAsyncData(
     regionCode ? `${BRANCHES_URL}?regionCode=${regionCode}` : null,
     fetchSafeBoxes,
   );

package/src/hooks/useLocation.ts

@@ -2,7 +2,7 @@ import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { defaultEventBus } from '../EventBus/defaultEventBus';
 import { useLatestEvent } from '../EventBus/useLatestEvent';
-import { fetchJSONUnsafe } from '../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 
 const REGION_URL = '/api/v1/region';
 
@@ -26,7 +26,10 @@ export function useLocation(defaultLocation = 'Москва'): [RegionData, (_:
     fireCurrentLocation(_);
   }, []);
 
-  const { data } = useAsyncData<RegionData>(REGION_URL, fetchJSONUnsafe);
+  const { data } = useAsyncData(
+    hasStoredLocation() ? null : REGION_URL,
+    fetchJSONUnsafe as FetchJSONUnsafeType<RegionData>,
+  );
   useEffect(() => {
     if (data && !hasStoredLocation()) {
       fireCurrentLocation(data);

package/src/hooks/useRegions.ts

@@ -1,5 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
-import { fetchJSONUnsafe } from '../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 
 const REGIONS_URL = '/api/v1/regions';
 
@@ -10,7 +10,7 @@ export interface Region {
 }
 
 export function useRegions(): Region[] {
-  const { data } = useAsyncData<Region[]>(REGIONS_URL, fetchJSONUnsafe);
+  const { data } = useAsyncData(REGIONS_URL, fetchJSONUnsafe as FetchJSONUnsafeType<Region[]>);
 
   return data || [];
 }

package/src/hooks/useSWRResource.ts

@@ -1,7 +1,7 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { type Fallback } from '../model/Fallback';
 import { projectSettings } from '../ProjectSettings';
-import { fetchJSONUnsafe } from '../utils/fetchJSON';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 import { joinPath } from '../utils/url';
 
 const EMPTY_VALUE = {};
@@ -26,9 +26,13 @@ export function useSWRResource<Data>(
     `${filename}.json`,
   );
 
-  const { data } = useAsyncData<Data, any, string | null>(filename ? path : null, fetchJSONUnsafe, {
-    fallback,
-  });
+  const { data } = useAsyncData(
+    filename ? path : null,
+    fetchJSONUnsafe as FetchJSONUnsafeType<Data>,
+    {
+      fallback,
+    },
+  );
 
   return data || (EMPTY_VALUE as Data);
 }

package/src/utils/fetchJSON.ts

@@ -1,7 +1,4 @@
-export async function fetchJSON<R = unknown>(
-  url: string,
-  options?: RequestInit,
-): Promise<R | null> {
+export async function fetchJSON<R = any>(url: string, options?: RequestInit): Promise<R | null> {
   try {
     return url ? await fetchJSONUnsafe(url, options) : null;
   } catch (err) {
@@ -11,7 +8,9 @@ export async function fetchJSON<R = unknown>(
   return null;
 }
 
-export async function fetchJSONUnsafe<R = unknown>(url: string, options?: RequestInit): Promise<R> {
+export type FetchJSONUnsafeType<R> = (url: string, options?: RequestInit) => Promise<R>;
+
+export const fetchJSONUnsafe: FetchJSONUnsafeType<any> = async (url, options) => {
   const response = await fetch(url, {
     ...options,
     headers: {
@@ -21,4 +20,4 @@ export async function fetchJSONUnsafe<R = unknown>(url: string, options?: Reques
   });
 
   return response.json();
-}
+};

package/src/utils/fetchMultitudeJSON.ts

@@ -1,9 +1,9 @@
 import { fetchJSON } from './fetchJSON';
 
-export async function fetchMultitudeJSON<R = unknown>(
-  ...urls: string[]
-): Promise<Awaited<R | null>[]> {
-  const fetchPromises = urls.map((url) => fetchJSON<R>(url));
+export type FetchMultitudeJSONType<R> = (...urls: string[]) => Promise<Awaited<R | null>[]>;
+
+export const fetchMultitudeJSON: FetchMultitudeJSONType<any> = (...urls) => {
+  const fetchPromises = urls.map((url) => fetchJSON(url));
 
   return Promise.all(fetchPromises);
-}
+};