@scbt-ecom/ui 0.166.0 → 0.167.0

package/dist/types/lib/shared/utils/index.d.ts

@@ -13,3 +13,4 @@ export * from './sessionStorage';
 export * from './variableHolder';
 export * from './extractTextFromHtml';
 export * from './variables';
+export * from './variablesFork';

package/dist/types/lib/shared/utils/variableHolder/variableContextHolder.d.ts

@@ -152,6 +152,9 @@ export interface VariableStore {
  * const processedString = transformVariable(stringWithVariables)
  * ```
  */
+/**
+ * @deprecated dont use
+ */
 export declare class VariableContextHolder<Key extends string = string, Value = string> implements IVariableContextHolder<Key, Value> {
     private _store;
     private _variables;

package/dist/types/lib/shared/utils/variables/variableResolver.d.ts

@@ -1,10 +1,11 @@
 import { AllowedVariablePrefix, Resolved, VariablePattern, VariableType } from './types';
 export declare const defaultAllowedPrefixes: AllowedVariablePrefix[];
-export declare const variableResolver: <Variable extends VariableType>() => {
-    addPattern: (start: VariablePattern["start"], end: VariablePattern["end"]) => /*elided*/ any;
-    addVariables: (vars: Variable[]) => /*elided*/ any;
+export type VariableResolver<Variable extends VariableType> = {
+    addPattern: (start: VariablePattern['start'], end: VariablePattern['end']) => VariableResolver<Variable>;
+    addVariables: (vars: Variable[]) => VariableResolver<Variable>;
     unwrapVariable: (string: string, allowedPrefixes?: AllowedVariablePrefix[]) => string;
     wrapVariable: (string: string, allowedPrefixes?: AllowedVariablePrefix[]) => string;
     escapeVariable: (string: string) => string;
     resolve: <T>(data: T) => Resolved<T>;
 };
+export declare const variableResolver: <Variable extends VariableType>() => VariableResolver<Variable>;

package/dist/types/lib/shared/utils/{variablesByNikita → variablesFork}/VariablesFork.d.ts

@@ -1,4 +1,4 @@
-export interface Variable {
+export interface Var {
     key: string;
     value: string;
     description: string;
@@ -22,7 +22,7 @@ export declare class VariablesFork {
     static matchVariables(string: string): string[];
     static wrap(string: string, prefix: (typeof this.allowedPrefixes)[number] | string): string;
     static unwrap(string: (typeof this.allowedPrefixes)[number] | string): string;
-    static mapKeysToVariables(keys: string[] | null, variables: Variable[]): Variable[];
-    static interpolate(string: string, variables: Variable[]): string;
-    static structureInterpolate<T>(data: T, variables: Variable[]): T;
+    static mapKeysToVariables(keys: string[] | null, variables: Var[]): Var[];
+    static interpolate(string: string, variables: Var[]): string;
+    static structureInterpolate<T>(data: T, variables: Var[]): T;
 }

package/dist/types/lib/shared/utils/variablesFork/index.d.ts

@@ -0,0 +1 @@
+export { VariablesFork, type Var } from './VariablesFork';

package/dist/types/lib/widgets/calculator/model/helpers.d.ts

@@ -1,4 +1,4 @@
-import { InfoListItemDTO, InfoListItemProps } from '../ui';
+import { InfoListItemProps } from '../ui';
 import { CalculatorVariables } from './types';
 export declare const evaluateFormula: (formula: string, variables: CalculatorVariables) => string;
-export declare const formatInfoList: (list: InfoListItemDTO[], variables: CalculatorVariables) => InfoListItemProps[];
+export declare const formatInfoList: (list: InfoListItemProps[], variables: CalculatorVariables) => InfoListItemProps[];

package/dist/types/lib/widgets/calculator/model/types.d.ts

@@ -1,9 +1,6 @@
 import { getCalculatorSchema } from './utils';
 export type CalculatorVariables = Record<string, any>;
 export type CalculatorSuffix = 'percent' | 'currency';
-export type ValueWithFormula = {
-    formula: string;
-};
-export type CalculatorValue = ValueWithFormula | string;
+export type CalculatorRootValue = string;
 export type ModalContentVariant = 'content1' | 'content2';
 export type CalculatorSchema = ReturnType<typeof getCalculatorSchema>;

package/dist/types/lib/widgets/calculator/model/utils.d.ts

@@ -1,9 +1,8 @@
 import { FieldValues } from 'react-hook-form';
 import { z } from 'zod';
 import { CalculatorViewProps } from '../..';
-import { CalculatorSuffix, ValueWithFormula } from './types';
+import { CalculatorSuffix } from './types';
 import { InfoListItemMode } from '../ui';
-export declare const isFormula: (value: ValueWithFormula | string) => value is ValueWithFormula;
 export declare const formatWithIntl: (suffix: CalculatorSuffix, value: number) => string | null;
 export declare const formatValueToRenderInfoItem: (renderMode: InfoListItemMode, value: string) => string | null;
 export declare const getCalculatorSchema: <T extends FieldValues>(props: CalculatorViewProps<T>["calculatorFieldsConfig"]["fieldsGroup"]) => z.ZodObject<any, z.UnknownKeysParam, z.ZodTypeAny, {

package/dist/types/lib/widgets/calculator/ui/calculatorInfo/CalculatorInfo.d.ts

@@ -10,4 +10,4 @@ export interface CalculatorInfoProps extends Omit<CalculatedBlockProps, 'classes
     classes?: CalculatorInfoClasses;
     headline?: string;
 }
-export declare const CalculatorInfo: ({ rootDescription, bottomDescription, rootValue, title, subtitle, buttonsConfig, infoList, suffix, assistHint, headline, classes }: CalculatorInfoProps) => import("react/jsx-runtime").JSX.Element;
+export declare const CalculatorInfo: ({ rootDescription, bottomDescription, rootValue, title, subtitle, buttonsConfig, infoList, suffix, assistHint, headline, isFormula, classes }: CalculatorInfoProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/lib/widgets/calculator/ui/calculatorInfo/ui/CalculatedBlock.d.ts

@@ -1,4 +1,4 @@
-import { CalculatorSuffix, CalculatorValue } from '../../../model';
+import { CalculatorRootValue, CalculatorSuffix } from '../../../model';
 export type CalculatedBlockClasses = {
     wrapper?: string;
     description?: string;
@@ -6,7 +6,8 @@ export type CalculatedBlockClasses = {
 };
 export interface CalculatedBlockProps {
     rootDescription: string;
-    rootValue: CalculatorValue;
+    rootValue: CalculatorRootValue;
+    isFormula: boolean;
     suffix: CalculatorSuffix;
     classes?: CalculatedBlockClasses;
 }

package/dist/types/lib/widgets/calculator/ui/calculatorInfo/ui/CalculatorInfoBody.d.ts

@@ -1,9 +1,9 @@
-import { InfoListItemDTO } from '../..';
+import { InfoListItemProps } from '../..';
 export type CalculatorInfoBodyClasses = {
     wrapper?: string;
 };
 export interface CalculatedInfoBodyProps {
-    infoList: InfoListItemDTO[];
+    infoList: InfoListItemProps[];
     classes?: CalculatorInfoBodyClasses;
     withoutDivider?: boolean;
 }

package/dist/types/lib/widgets/calculator/ui/calculatorInfo/ui/InfoListItem.d.ts

@@ -1,18 +1,14 @@
-import { CalculatorSuffix, CalculatorValue } from '../../../model';
+import { CalculatorSuffix } from '../../../model';
 export type InfoListItemMode = CalculatorSuffix | 'text';
 export type InfoListItemColor = 'dark' | 'blue';
-export interface InfoListItemCommon {
+export type InfoListItemValue = string;
+export interface InfoListItemProps {
     label: string;
     mode: InfoListItemMode;
     hint?: string;
     accent?: boolean;
     color?: InfoListItemColor;
-    withFormula?: boolean;
-}
-export interface InfoListItemDTO extends InfoListItemCommon {
-    value: CalculatorValue;
-}
-export interface InfoListItemProps extends InfoListItemCommon {
-    value: string;
+    isFormula: boolean;
+    value: InfoListItemValue;
 }
 export declare const InfoListItem: ({ hint, value, label, mode, color, accent }: InfoListItemProps) => import("react/jsx-runtime").JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scbt-ecom/ui",
-  "version": "0.166.0",
+  "version": "0.167.0",
   "type": "module",
   "exports": {
     ".": {

package/dist/lib/shared/utils/variablesByNikita/VariablesFork.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"VariablesFork.js","sources":["../../../../../lib/shared/utils/variablesByNikita/VariablesFork.ts"],"sourcesContent":["import { TypeGuards } from '../typeGuards'\n\nexport interface Variable {\n  key: string\n  value: string\n  description: string\n}\n\n/** Что нам для этого нужно\n * 1. Реализация CRUD для переменных в админке\n * 2.\n *    - Нужно реализовать функцию traverseToData чтобы бежать по всей структуре данных\n *    - Нужно реализовать функцию, которая ищет в строке переменную matchVarsFromString, и возвращает массив ключей переменных\n *    - Для match нужно описать регулярку, которая матчит переменную, а так же добавить возможно прокидывать регулярку в конструктор\n *    - Нужно реализовать функцию, которая массив ключей транформирует в entries [[${var}, 'boba'], [${var2}, 'biba']], чтобы трансформировать нужно написать метод entriesOf\n *    - entriesOf метод, который сравнивает айтемы с бэка с текущим ключом и возвратает entries  [[${var}, 'boba'], [${var2}, 'biba']]\n *    - Потом нужно в текущей строке подменить ключ на value, делаем мы это через перебор всех переменных, которые мы нашли в строке\n *    - Нужно ещё раз пробежатся по итовой строке, и проверить её на переменные с помощью функции matchVarsFromString\n *    - Нужно добавить функции wrap и unwrap\n */\n\nexport class VariablesFork {\n  private static regexes = [/\\$\\{([^}]+)}/g, /@\\{([^}]+)}/g]\n  private static allowedPrefixes = ['$', '@', '#'] as const\n\n  private constructor() {}\n\n  static matchVariables(string: string) {\n    const result = []\n    for (const regex of this.regexes) {\n      const matched = string.match(regex)\n\n      if (matched) {\n        result.push(...matched)\n      }\n    }\n\n    return result\n  }\n\n  static wrap(string: string, prefix: (typeof this.allowedPrefixes)[number] | string) {\n    return `${prefix}{${string}}`\n  }\n\n  static unwrap(string: (typeof this.allowedPrefixes)[number] | string): string {\n    if (!(string.length > 1)) return string\n\n    const firstChar = string[0]\n    const secondChar = string[1]\n    const isWrapped =\n      this.allowedPrefixes.includes(firstChar as (typeof this.allowedPrefixes)[number]) &&\n      secondChar === '{' &&\n      string.endsWith('}')\n\n    if (isWrapped) {\n      return string.slice(2, -1)\n    }\n\n    return string\n  }\n\n  static mapKeysToVariables(keys: string[] | null, variables: Variable[]) {\n    const entries = []\n\n    for (const variable of variables) {\n      if (keys?.includes(variable.key)) {\n        entries.push(variable)\n      }\n    }\n\n    return entries\n  }\n\n  static interpolate(string: string, variables: Variable[]) {\n    let str = string\n\n    let matches = this.matchVariables(string)\n    let detectedVariables = this.mapKeysToVariables(matches ?? [], variables)\n\n    while (!TypeGuards.isArrayEmpty(detectedVariables)) {\n      detectedVariables.forEach(({ key, value }) => {\n        str = str.replace(key, value)\n      })\n\n      matches = this.matchVariables(str)\n      detectedVariables = this.mapKeysToVariables(matches ?? [], detectedVariables)\n    }\n\n    return str\n  }\n\n  static structureInterpolate<T>(data: T, variables: Variable[]): T {\n    if (typeof data === 'string') {\n      return this.interpolate(data, variables) as T\n    }\n\n    if (TypeGuards.isArray(data)) {\n      return data.map((item) => this.structureInterpolate(item, variables)) as T\n    }\n\n    if (typeof data === 'object' && data !== null) {\n      const processed = {} as Record<keyof T, unknown>\n      const keys = Object.keys(data) as (keyof T)[]\n\n      for (const key of keys) {\n        processed[key] = this.structureInterpolate(data[key], variables)\n      }\n\n      return processed as T\n    }\n\n    return data\n  }\n}\n"],"names":["VariablesFork","string","result","regex","matched","prefix","firstChar","secondChar","keys","variables","entries","variable","str","matches","detectedVariables","TypeGuards","key","value","data","item","processed"],"mappings":"8CAqBO,MAAMA,CAAc,CACzB,OAAe,QAAU,CAAC,gBAAiB,cAAc,EACzD,OAAe,gBAAkB,CAAC,IAAK,IAAK,GAAG,EAEvC,aAAc,CAAC,CAEvB,OAAO,eAAeC,EAAgB,CACpC,MAAMC,EAAS,CAAA,EACf,UAAWC,KAAS,KAAK,QAAS,CAChC,MAAMC,EAAUH,EAAO,MAAME,CAAK,EAE9BC,GACFF,EAAO,KAAK,GAAGE,CAAO,CAE1B,CAEA,OAAOF,CACT,CAEA,OAAO,KAAKD,EAAgBI,EAAwD,CAClF,MAAO,GAAGA,CAAM,IAAIJ,CAAM,GAC5B,CAEA,OAAO,OAAOA,EAAgE,CAC5E,GAAI,EAAEA,EAAO,OAAS,GAAI,OAAOA,EAEjC,MAAMK,EAAYL,EAAO,CAAC,EACpBM,EAAaN,EAAO,CAAC,EAM3B,OAJE,KAAK,gBAAgB,SAASK,CAAkD,GAChFC,IAAe,KACfN,EAAO,SAAS,GAAG,EAGZA,EAAO,MAAM,EAAG,EAAE,EAGpBA,CACT,CAEA,OAAO,mBAAmBO,EAAuBC,EAAuB,CACtE,MAAMC,EAAU,CAAA,EAEhB,UAAWC,KAAYF,EACjBD,GAAM,SAASG,EAAS,GAAG,GAC7BD,EAAQ,KAAKC,CAAQ,EAIzB,OAAOD,CACT,CAEA,OAAO,YAAYT,EAAgBQ,EAAuB,CACxD,IAAIG,EAAMX,EAENY,EAAU,KAAK,eAAeZ,CAAM,EACpCa,EAAoB,KAAK,mBAAmBD,GAAW,CAAA,EAAIJ,CAAS,EAExE,KAAO,CAACM,EAAW,aAAaD,CAAiB,GAC/CA,EAAkB,QAAQ,CAAC,CAAE,IAAAE,EAAK,MAAAC,KAAY,CAC5CL,EAAMA,EAAI,QAAQI,EAAKC,CAAK,CAC9B,CAAC,EAEDJ,EAAU,KAAK,eAAeD,CAAG,EACjCE,EAAoB,KAAK,mBAAmBD,GAAW,CAAA,EAAIC,CAAiB,EAG9E,OAAOF,CACT,CAEA,OAAO,qBAAwBM,EAAST,EAA0B,CAChE,GAAI,OAAOS,GAAS,SAClB,OAAO,KAAK,YAAYA,EAAMT,CAAS,EAGzC,GAAIM,EAAW,QAAQG,CAAI,EACzB,OAAOA,EAAK,IAAKC,GAAS,KAAK,qBAAqBA,EAAMV,CAAS,CAAC,EAGtE,GAAI,OAAOS,GAAS,UAAYA,IAAS,KAAM,CAC7C,MAAME,EAAY,CAAA,EACZZ,EAAO,OAAO,KAAKU,CAAI,EAE7B,UAAWF,KAAOR,EAChBY,EAAUJ,CAAG,EAAI,KAAK,qBAAqBE,EAAKF,CAAG,EAAGP,CAAS,EAGjE,OAAOW,CACT,CAEA,OAAOF,CACT,CACF"}

package/dist/types/lib/shared/utils/variablesByNikita/index.d.ts

@@ -1 +0,0 @@
-export { VariablesFork, type Variable } from './VariablesFork';