@snack-uikit/utils 3.7.1-preview-922d2ce6.0 → 3.7.1-preview-74c13173.0

package/README.md

@@ -86,7 +86,7 @@
 | filter* | `TFilter` | - |  |
 | options | `FilterStateOptions<TFilter>` | - |  |
 | parser | `(jsonFilter: string) => TFilter` | - |  |
-| encoder | `(filter: TFilter) => string` | - |  |
+| serializer | `(filter: TFilter) => string` | - |  |
 ## ThemeProvider
 Провайдер, предназначенный для работы с темами
 ### Props

package/dist/cjs/hooks/useSaveFilterState.d.ts

@@ -2,12 +2,12 @@ import { StateProps } from './useSaveState';
 export type FilterStateOptions<T> = {
     filterQueryKey: string;
     filterLocalStorageKey: string;
-    validateData: (value: unknown) => value is T;
+    validateData(value: unknown): value is T;
 };
 type FilterStateProps<TFilter> = Omit<StateProps<TFilter>, 'source'> & {
     options?: FilterStateOptions<TFilter>;
-    parser?: (jsonFilter: string) => TFilter;
-    encoder?: (filter: TFilter) => string;
+    parser?(jsonFilter: string): TFilter;
+    serializer?(filter: TFilter): string;
 };
-export declare const useSaveFilterState: <TFilter>({ options, filter, onLoadFilter }: FilterStateProps<TFilter>) => void;
+export declare const useSaveFilterState: <TFilter>({ options, filter, onLoadFilter, parser, serializer, }: FilterStateProps<TFilter>) => void;
 export {};

package/dist/cjs/hooks/useSaveFilterState.js

@@ -10,7 +10,9 @@ const useSaveFilterState = _ref => {
   let {
     options,
     filter,
-    onLoadFilter
+    onLoadFilter,
+    parser,
+    serializer
   } = _ref;
   const [queryFilter, setQueryFilter] = (0, react_1.useState)(null);
   const [localStorageFilter, setLocalStorageFilter] = (0, react_1.useState)(null);
@@ -30,8 +32,8 @@ const useSaveFilterState = _ref => {
       localStorage: true
     }));
   }, []);
-  const querySource = (0, react_1.useMemo)(() => options ? new useSaveState_1.QueryParamSource(options.filterQueryKey, options.validateData) : undefined, [options]);
-  const localStorageSource = (0, react_1.useMemo)(() => options ? new useSaveState_1.LocalStorageSource(options.filterLocalStorageKey, options.validateData) : undefined, [options]);
+  const querySource = (0, react_1.useMemo)(() => options ? new useSaveState_1.QueryParamSource(options.filterQueryKey, options.validateData, parser, serializer) : undefined, [options, parser, serializer]);
+  const localStorageSource = (0, react_1.useMemo)(() => options ? new useSaveState_1.LocalStorageSource(options.filterLocalStorageKey, options.validateData, parser, serializer) : undefined, [options, parser, serializer]);
   (0, useSaveState_1.useSaveState)({
     filter,
     onLoadFilter: onLoadQueryParams,

package/dist/cjs/hooks/useSaveState/sources/baseSource.d.ts

@@ -1,11 +1,11 @@
 export declare abstract class BaseSource<TFilter> {
     filterKey: string;
     private validate;
-    protected parse: (value: string) => TFilter;
-    protected encode: (value: TFilter) => string;
+    protected parser: (value: string) => TFilter;
+    protected serializer: (value: TFilter) => string;
     protected abstract getFormSource(): string;
     protected abstract setToSource(value: string): void;
-    constructor(filterKey: string, validate: (value: unknown) => value is TFilter, parse?: (value: string) => TFilter, encode?: (value: TFilter) => string);
+    constructor(filterKey: string, validate: (value: unknown) => value is TFilter, parser?: (value: string) => TFilter, serializer?: (value: TFilter) => string);
     getFilter: () => NonNullable<TFilter> | null;
     setFilter: (filter: TFilter) => void;
 }

package/dist/cjs/hooks/useSaveState/sources/baseSource.js

@@ -5,26 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BaseSource = void 0;
 class BaseSource {
-  constructor(filterKey, validate, parse, encode) {
+  constructor(filterKey, validate, parser, serializer) {
     this.filterKey = filterKey;
     this.validate = validate;
-    this.parse = JSON.parse;
-    this.encode = JSON.stringify;
+    this.parser = JSON.parse;
+    this.serializer = JSON.stringify;
     this.getFilter = () => {
       const filterFromQueryParams = this.getFormSource();
-      const parsedValue = filterFromQueryParams ? this.parse(filterFromQueryParams) : null;
+      const parsedValue = filterFromQueryParams ? this.parser(filterFromQueryParams) : null;
       const isValid = parsedValue && this.validate(parsedValue);
       return isValid ? parsedValue : null;
     };
     this.setFilter = filter => {
-      const encodedValue = this.encode(filter);
+      const encodedValue = this.serializer(filter);
       this.setToSource(encodedValue);
     };
-    if (parse) {
-      this.parse = parse;
+    if (parser) {
+      this.parser = parser;
     }
-    if (encode) {
-      this.encode = encode;
+    if (serializer) {
+      this.serializer = serializer;
     }
   }
 }

package/dist/cjs/hooks/useSaveState/useSaveState.d.ts

@@ -1,7 +1,7 @@
 import { BaseSource } from './sources/baseSource';
 export type StateProps<T> = {
     filter: T;
-    onLoadFilter: (filter: T | null) => void;
+    onLoadFilter(filter: T | null): void;
     source?: BaseSource<T>;
 };
 export declare const useSaveState: <T>({ filter, onLoadFilter, source }: StateProps<T>) => void;

package/dist/esm/hooks/useSaveFilterState.d.ts

@@ -2,12 +2,12 @@ import { StateProps } from './useSaveState';
 export type FilterStateOptions<T> = {
     filterQueryKey: string;
     filterLocalStorageKey: string;
-    validateData: (value: unknown) => value is T;
+    validateData(value: unknown): value is T;
 };
 type FilterStateProps<TFilter> = Omit<StateProps<TFilter>, 'source'> & {
     options?: FilterStateOptions<TFilter>;
-    parser?: (jsonFilter: string) => TFilter;
-    encoder?: (filter: TFilter) => string;
+    parser?(jsonFilter: string): TFilter;
+    serializer?(filter: TFilter): string;
 };
-export declare const useSaveFilterState: <TFilter>({ options, filter, onLoadFilter }: FilterStateProps<TFilter>) => void;
+export declare const useSaveFilterState: <TFilter>({ options, filter, onLoadFilter, parser, serializer, }: FilterStateProps<TFilter>) => void;
 export {};

package/dist/esm/hooks/useSaveFilterState.js

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { LocalStorageSource, QueryParamSource, useSaveState } from './useSaveState';
-export const useSaveFilterState = ({ options, filter, onLoadFilter }) => {
+export const useSaveFilterState = ({ options, filter, onLoadFilter, parser, serializer, }) => {
     const [queryFilter, setQueryFilter] = useState(null);
     const [localStorageFilter, setLocalStorageFilter] = useState(null);
     const [isLoaded, setIsLoaded] = useState({
@@ -15,8 +15,12 @@ export const useSaveFilterState = ({ options, filter, onLoadFilter }) => {
         setLocalStorageFilter(value);
         setIsLoaded(prev => (Object.assign(Object.assign({}, prev), { localStorage: true })));
     }, []);
-    const querySource = useMemo(() => (options ? new QueryParamSource(options.filterQueryKey, options.validateData) : undefined), [options]);
-    const localStorageSource = useMemo(() => (options ? new LocalStorageSource(options.filterLocalStorageKey, options.validateData) : undefined), [options]);
+    const querySource = useMemo(() => options
+        ? new QueryParamSource(options.filterQueryKey, options.validateData, parser, serializer)
+        : undefined, [options, parser, serializer]);
+    const localStorageSource = useMemo(() => options
+        ? new LocalStorageSource(options.filterLocalStorageKey, options.validateData, parser, serializer)
+        : undefined, [options, parser, serializer]);
     useSaveState({ filter, onLoadFilter: onLoadQueryParams, source: querySource });
     useSaveState({ filter, onLoadFilter: onLoadLocalStorage, source: localStorageSource });
     useEffect(() => {

package/dist/esm/hooks/useSaveState/sources/baseSource.d.ts

@@ -1,11 +1,11 @@
 export declare abstract class BaseSource<TFilter> {
     filterKey: string;
     private validate;
-    protected parse: (value: string) => TFilter;
-    protected encode: (value: TFilter) => string;
+    protected parser: (value: string) => TFilter;
+    protected serializer: (value: TFilter) => string;
     protected abstract getFormSource(): string;
     protected abstract setToSource(value: string): void;
-    constructor(filterKey: string, validate: (value: unknown) => value is TFilter, parse?: (value: string) => TFilter, encode?: (value: TFilter) => string);
+    constructor(filterKey: string, validate: (value: unknown) => value is TFilter, parser?: (value: string) => TFilter, serializer?: (value: TFilter) => string);
     getFilter: () => NonNullable<TFilter> | null;
     setFilter: (filter: TFilter) => void;
 }

package/dist/esm/hooks/useSaveState/sources/baseSource.js

@@ -1,24 +1,24 @@
 export class BaseSource {
-    constructor(filterKey, validate, parse, encode) {
+    constructor(filterKey, validate, parser, serializer) {
         this.filterKey = filterKey;
         this.validate = validate;
-        this.parse = JSON.parse;
-        this.encode = JSON.stringify;
+        this.parser = JSON.parse;
+        this.serializer = JSON.stringify;
         this.getFilter = () => {
             const filterFromQueryParams = this.getFormSource();
-            const parsedValue = filterFromQueryParams ? this.parse(filterFromQueryParams) : null;
+            const parsedValue = filterFromQueryParams ? this.parser(filterFromQueryParams) : null;
             const isValid = parsedValue && this.validate(parsedValue);
             return isValid ? parsedValue : null;
         };
         this.setFilter = (filter) => {
-            const encodedValue = this.encode(filter);
+            const encodedValue = this.serializer(filter);
             this.setToSource(encodedValue);
         };
-        if (parse) {
-            this.parse = parse;
+        if (parser) {
+            this.parser = parser;
         }
-        if (encode) {
-            this.encode = encode;
+        if (serializer) {
+            this.serializer = serializer;
         }
     }
 }

package/dist/esm/hooks/useSaveState/useSaveState.d.ts

@@ -1,7 +1,7 @@
 import { BaseSource } from './sources/baseSource';
 export type StateProps<T> = {
     filter: T;
-    onLoadFilter: (filter: T | null) => void;
+    onLoadFilter(filter: T | null): void;
     source?: BaseSource<T>;
 };
 export declare const useSaveState: <T>({ filter, onLoadFilter, source }: StateProps<T>) => void;

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Utils",
-  "version": "3.7.1-preview-922d2ce6.0",
+  "version": "3.7.1-preview-74c13173.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -39,5 +39,5 @@
     "react-swipeable": "7.0.2",
     "uncontrollable": "8.0.4"
   },
-  "gitHead": "da296f68066e5ca81e4569c3dee87d637c6bd6a1"
+  "gitHead": "a3a4d2281eb9a1143c3a60efd0ccca4daa5c246c"
 }

package/src/hooks/useSaveFilterState.ts

@@ -5,16 +5,22 @@ import { LocalStorageSource, QueryParamSource, StateProps, useSaveState } from '
 export type FilterStateOptions<T> = {
   filterQueryKey: string;
   filterLocalStorageKey: string;
-  validateData: (value: unknown) => value is T;
+  validateData(value: unknown): value is T;
 };
 
 type FilterStateProps<TFilter> = Omit<StateProps<TFilter>, 'source'> & {
   options?: FilterStateOptions<TFilter>;
-  parser?: (jsonFilter: string) => TFilter;
-  encoder?: (filter: TFilter) => string;
+  parser?(jsonFilter: string): TFilter;
+  serializer?(filter: TFilter): string;
 };
 
-export const useSaveFilterState = <TFilter>({ options, filter, onLoadFilter }: FilterStateProps<TFilter>) => {
+export const useSaveFilterState = <TFilter>({
+  options,
+  filter,
+  onLoadFilter,
+  parser,
+  serializer,
+}: FilterStateProps<TFilter>) => {
   const [queryFilter, setQueryFilter] = useState<TFilter | null>(null);
   const [localStorageFilter, setLocalStorageFilter] = useState<TFilter | null>(null);
   const [isLoaded, setIsLoaded] = useState<{ localStorage: boolean; queryParams: boolean }>({
@@ -33,12 +39,18 @@ export const useSaveFilterState = <TFilter>({ options, filter, onLoadFilter }: F
   }, []);
 
   const querySource = useMemo(
-    () => (options ? new QueryParamSource<TFilter>(options.filterQueryKey, options.validateData) : undefined),
-    [options],
+    () =>
+      options
+        ? new QueryParamSource<TFilter>(options.filterQueryKey, options.validateData, parser, serializer)
+        : undefined,
+    [options, parser, serializer],
   );
   const localStorageSource = useMemo(
-    () => (options ? new LocalStorageSource<TFilter>(options.filterLocalStorageKey, options.validateData) : undefined),
-    [options],
+    () =>
+      options
+        ? new LocalStorageSource<TFilter>(options.filterLocalStorageKey, options.validateData, parser, serializer)
+        : undefined,
+    [options, parser, serializer],
   );
 
   useSaveState<TFilter>({ filter, onLoadFilter: onLoadQueryParams, source: querySource });

package/src/hooks/useSaveState/sources/baseSource.ts

@@ -1,32 +1,32 @@
 export abstract class BaseSource<TFilter> {
-  protected parse: (value: string) => TFilter = JSON.parse;
-  protected encode: (value: TFilter) => string = JSON.stringify;
+  protected parser: (value: string) => TFilter = JSON.parse;
+  protected serializer: (value: TFilter) => string = JSON.stringify;
   protected abstract getFormSource(): string;
   protected abstract setToSource(value: string): void;
 
   constructor(
     public filterKey: string,
     private validate: (value: unknown) => value is TFilter,
-    parse?: (value: string) => TFilter,
-    encode?: (value: TFilter) => string,
+    parser?: (value: string) => TFilter,
+    serializer?: (value: TFilter) => string,
   ) {
-    if (parse) {
-      this.parse = parse;
+    if (parser) {
+      this.parser = parser;
     }
-    if (encode) {
-      this.encode = encode;
+    if (serializer) {
+      this.serializer = serializer;
     }
   }
 
   getFilter = () => {
     const filterFromQueryParams = this.getFormSource();
-    const parsedValue = filterFromQueryParams ? (this.parse(filterFromQueryParams) as TFilter) : null;
+    const parsedValue = filterFromQueryParams ? (this.parser(filterFromQueryParams) as TFilter) : null;
     const isValid = parsedValue && this.validate(parsedValue);
     return isValid ? parsedValue : null;
   };
 
   setFilter = (filter: TFilter) => {
-    const encodedValue = this.encode(filter);
+    const encodedValue = this.serializer(filter);
     this.setToSource(encodedValue);
   };
 }

package/src/hooks/useSaveState/useSaveState.ts

@@ -4,12 +4,13 @@ import { BaseSource } from './sources/baseSource';
 
 export type StateProps<T> = {
   filter: T;
-  onLoadFilter: (filter: T | null) => void;
+  onLoadFilter(filter: T | null): void;
   source?: BaseSource<T>;
 };
 
 export const useSaveState = <T>({ filter, onLoadFilter, source }: StateProps<T>) => {
   const [isLoaded, setIsLoaded] = useState<boolean>(false);
+
   useEffect(() => {
     if (!source) {
       return;