mdt-client 1.3.0 → 31.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mdt-client",
-	"version": "1.3.0",
+	"version": "31.0.0",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/readme.md

@@ -1,15 +1,15 @@
-### Установка
-
-Установка с помощью `npm`
-
-```
-npm install mdt-client
-```
-
-### Использование
-
-Для использования нужно импортировать нужный компонент
-
-```js
-import { Navigation } from "mdt-client";
-```
+### Установка
+
+Установка с помощью `npm`
+
+```
+npm install mdt-client
+```
+
+### Использование
+
+Для использования нужно импортировать нужный компонент
+
+```js
+import { Navigation } from "mdt-client";
+```

package/types/common/Field.d.ts

@@ -1,5 +1,5 @@
-import { FieldCode, FieldKind, Valued } from "mdtScripts/helpers/types";
-import { IFilter } from "mdtServices/IFilter";
+import { FieldCode, FieldKind, Valued } from "../helpers/types";
+import { IFilter } from "../services/IFilter";
 import { Record } from "./Record";
 import { Table } from "./Table";
 export interface Field extends Record {
@@ -27,6 +27,7 @@ export interface Field extends Record {
     isFixedLength?: boolean;
     defaultValue?: string | number | boolean | Date;
     formatMask?: string;
+    computed?: boolean;
     refTable?: Table;
     readonly?: boolean;
     multiple?: boolean;

package/types/common/Record.d.ts

@@ -12,8 +12,11 @@ export interface Record {
     $new?: boolean;
     $dirty?: boolean;
     $destroy?: boolean;
-    $params?: any;
     [field: string]: any;
 }
 export declare type MdtRecord = Record;
+export declare type HierarchicalRecord<R = MdtRecord> = R & {
+    $hierarchy?: HierarchicalRecord<R>[];
+    $matched?: boolean;
+};
 export {};

package/types/common/Table.d.ts

@@ -1,6 +1,6 @@
-import { Icon } from "mdtScripts/components/icon/iconOptions";
-import { ModuleId, ObjectCode, ObjectId, ObjectTitle } from "mdtScripts/helpers/types";
-import { PermissionLevel } from "../security/PermissionLevel";
+import { Icon } from "../components/icon/iconOptions";
+import { ModuleId, ObjectCode, ObjectId, ObjectTitle } from "../helpers/types";
+import { PermissionLevelString } from "../security/PermissionLevel";
 import { Datasource } from "./Datasource";
 import { Field } from "./Field";
 import { Record } from "./Record";
@@ -24,7 +24,7 @@ export interface Table extends Record {
     $datasource?: Datasource;
     id_ObjectType?: string;
     tag_Enabled?: any;
-    accessLevel?: PermissionLevel;
+    accessLevel?: PermissionLevelString;
     children?: Array<string>;
     readonly?: boolean;
     icon?: Icon;

package/types/common/list/group/groupTypes.d.ts

@@ -0,0 +1,26 @@
+import { FieldPath } from "../../../helpers/types";
+import { QuerySortingObject } from "../../../services//api/QuerySorting";
+export declare namespace Grouping {
+    interface Group {
+        groups?: GroupItem[];
+        allParents?: boolean;
+        orphans?: boolean;
+        toggledValues?: string[][];
+    }
+    interface GroupItem {
+        fieldPath: FieldPath;
+        collapsed?: boolean;
+        select?: FieldPath[];
+        sorting?: QuerySortingObject[];
+        label?: GroupLabel | false;
+        toggledValues?: any[];
+        withEmpty?: boolean;
+        sortDesc?: boolean;
+    }
+    type GroupLabel = {
+        title?: string;
+        icon?: string;
+        color?: string;
+        textColor?: string;
+    };
+}

package/types/common/list/hierarchy/hierarchyTypes.d.ts

@@ -0,0 +1,39 @@
+import { Table } from "../../../common/Table";
+import { FieldCode } from "../../../helpers/types";
+import { IFilter } from "../../../services/IFilter";
+export declare type HierarchyMode = "" | "-" | "+" | "#";
+export interface HierarchyQuery {
+    /** Поле с ID родительской записи */
+    parentField?: FieldCode;
+    /** Поле ID записи */
+    primaryField?: FieldCode;
+    /**
+     * Режим фильтрации иерархии.
+     * "-" - Отображать всех родителей отфильтрованной записи,
+     * "+" - Отображать все дочерние записи отфильтрованной записи,
+     * "#" - Оторбражать все родительские и дочерние записи
+     */
+    mode?: HierarchyMode;
+    /** Фильтр для дочерних и родительских записей, не попадающих под критерии основной фильтрации списка */
+    filter?: IFilter;
+    table?: Table;
+}
+export interface HierarchyListExtenderPublicOptions extends Exclude<HierarchyQuery, "table"> {
+    /**
+     * Ключи наборов фильтров, при которых фильтрация считается наложенной. Используется для отображения кнопок режима фильтрации.
+     * Например: "default", "extended"
+     */
+    defaultFilterKeys?: string[];
+    /**
+     * Изменение иерархии с помощью перетаскивания
+     */
+    dragDropEnabled?: boolean;
+    /** Расширение кнопки типа иерархии
+     * @ignore
+     */
+    buttonExtend?: any;
+    /**
+     * Уровень до которого будут раскрыты узлы
+     */
+    expandedLevel?: number;
+}

package/types/components/baseFormControls/input/{inputView.d.ts → inputOptions.d.ts}

@@ -1,10 +1,7 @@
 /// <reference types="../../../../mithril" />
-/// <reference types="mithril" />
-import "./inputView.less";
-import { ComponentSize } from "mdtScripts/helpers/utils/stringifyControlSize";
-import { KeyboardActions } from "mdtScripts/helpers/ui/elementModificators/focusableComponent";
-import { CSSClassName } from "mdtScripts/helpers/types";
-export declare function inputView({ attrs, hasError, size, ...options }: InputOptions): _mithril.MithrilVirtualElement;
+import { CSSClassName } from "../../../helpers/types";
+import { KeyboardActions } from "../../../helpers/ui/elementModificators/focusableComponent";
+import { ComponentSize } from "../../../helpers/utils/stringifyControlSize";
 export interface InputOptions {
     id?: string;
     value?: string | number;

package/types/components/button/baseButton/buttonOptions.d.ts

@@ -0,0 +1,12 @@
+import { ViewElement } from "mdtScripts/helpers/types";
+import { ComponentSize } from "mdtScripts/helpers/utils/stringifyControlSize";
+export interface ButtonOptions {
+    title?: string;
+    command?: () => void;
+    className?: string;
+    tooltip?: string;
+    enabled?: boolean;
+    icon?: string;
+    endElement?: ViewElement;
+    size?: ComponentSize;
+}

package/types/components/buttonGroup/buttonGroupOptions.d.ts

@@ -0,0 +1,7 @@
+import { ButtonOptions } from "../button/baseButton/buttonOptions";
+export declare type GroupButtonOptions = ButtonOptions & {
+    selected: boolean;
+};
+export interface ButtonGroupOptions {
+    buttons: GroupButtonOptions[];
+}

package/types/components/dropdown/menuActionItem/dropdownMenuItemOptions.d.ts

@@ -1,6 +1,6 @@
-import { Icon } from "mdtScripts/components/icon/iconOptions";
-import { FormattedText } from "mdtScripts/helpers/formattedText";
-import { CSSClassName, ViewElement, Valued } from "mdtScripts/helpers/types";
+import { Icon } from "../../../components/icon/iconOptions";
+import { FormattedText } from "../../../helpers/formattedText";
+import { CSSClassName, ViewElement, Valued } from "../../../helpers/types";
 export interface DropdownMenuItemBaseOptions {
     icon?: Valued<Icon>;
     title: Valued<string>;

package/types/components/form/label/labelOptions.d.ts

@@ -0,0 +1,18 @@
+import { IconButtonOptions } from "mdtScripts/components/iconButton/iconButtonOptions";
+import { CSSClassName } from "mdtScripts/helpers/types";
+export interface LabelIconButton {
+    name: string;
+    options: IconButtonOptions;
+}
+export interface LabelOptions {
+    title: string;
+    description?: string;
+    required?: boolean;
+    error?: string;
+    iconButtons?: LabelIconButton[];
+}
+export interface LabelViewOptions extends LabelOptions {
+    for?: string;
+    onClick?: () => void;
+    className?: CSSClassName;
+}

package/types/components/icon/iconOptions.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="../../../../mithril" />
-/// <reference types="mithril" />
-import { CSSClassName } from "mdtScripts/helpers/types";
+import { CSSClassName } from "../../helpers/types";
 import { FormattedText } from "../../helpers/formattedText";
 export declare type Icon = string;
 export interface BaseIconOptions {

package/types/components/iconButton/iconButtonOptions.d.ts

@@ -0,0 +1,7 @@
+import { UiType } from "../../helpers/IUi";
+import { CommandEvent } from "../../helpers/types";
+import { IconOptions } from "../icon/iconOptions";
+export interface IconButtonOptions extends IconOptions {
+    command?: (e: CommandEvent) => void;
+    type?: UiType;
+}

package/types/components/processPrincipalsList/ProcessPrincipalsListItem.d.ts

@@ -1,4 +1,4 @@
-import { RecordId } from "mdtScripts/common/Record";
+import { RecordId } from "../../common/Record";
 export interface ProcessPrincipalsListItem {
     id: RecordId;
     title: string;

package/types/components/resizablePanels/panelTitle/panelTitleOptions.d.ts

@@ -0,0 +1,15 @@
+import { LabelIconButton } from "../../../components/form/label/labelOptions";
+import { FormattedText } from "../../../helpers/formattedText";
+import { CSSClassName, Valued, ViewElement } from "../../../helpers/types";
+export declare type PanelTitleTextContent = string;
+export interface PanelTitleOptions {
+    text: Valued<PanelTitleTextContent>;
+    tooltip?: Valued<FormattedText>;
+    endZone?: PanelTitleEndZone;
+    icons?: Valued<LabelIconButton | undefined>[];
+    className?: Valued<CSSClassName>;
+    wrapperClassName?: string;
+}
+export interface PanelTitleEndZone {
+    view: () => ViewElement;
+}

package/types/components/resizablePanels/panelToolbar/panelToolbarOptions.d.ts

@@ -0,0 +1,4 @@
+import { ButtonGroupOptions } from "mdtScripts/components/buttonGroup/buttonGroupOptions";
+export interface PanelToolbarOptions {
+    buttonGroup: ButtonGroupOptions;
+}

package/types/components/resizablePanels/resizablePanel/resizablePanelOptions.d.ts

@@ -0,0 +1,24 @@
+import { ViewElement } from "../../../helpers/types";
+import { PanelToolbarOptions } from "../panelToolbar/panelToolbarOptions";
+import { PanelTitleOptions } from "../panelTitle/panelTitleOptions";
+export interface ResizablePanelOptions {
+    content: ResizablePanelContent;
+    onCreated?: (el: HTMLElement, onUnload: (handler: () => void) => void) => void;
+}
+export declare type OnPanelResize = () => void;
+export interface ResizablePanelContent {
+    view: () => ViewElement;
+    onResize?: OnPanelResize;
+    title?: PanelTitleOptions;
+    toolbar?: PanelToolbarOptions;
+    topZone?: PanelTopZone;
+    className?: string;
+    focusOptions?: ResizablePanelFocusOptions;
+}
+export interface PanelTopZone {
+    view: () => ViewElement;
+}
+export declare type ResizablePanelOnFocus = (focusedByUser: boolean) => void;
+export interface ResizablePanelFocusOptions {
+    onFocus?: ResizablePanelOnFocus;
+}

package/types/components/resizablePanels/resizablePanelsOptions.d.ts

@@ -0,0 +1,22 @@
+import { MithrilVirtualElementKey } from "../../helpers/types";
+import { ResizablePanelContent } from "./resizablePanel/resizablePanelOptions";
+export declare type PanelsDirection = "row" | "column";
+export declare type PanelSizeFactor = number;
+export interface PanelWithSizeFactor {
+    /**
+     * Размер панели в долях. Все панели по-умолчанию имеют размер 1. Если, например, задать 2, то панель будет больше остальных в два раза.
+     * @default 1
+     */
+    size?: PanelSizeFactor;
+}
+export interface ResizablePanelsItemContent extends ResizablePanelContent, PanelWithSizeFactor {
+}
+export interface ResizablePanelsContentItem extends ResizablePanelsItemContent {
+    key: MithrilVirtualElementKey;
+}
+export interface ResizablePanelsOptions {
+    direction: PanelsDirection;
+    content: ResizablePanelsContentItem[];
+    resizerSize?: number;
+    highlightFocusedPanel?: boolean;
+}

package/types/components/toggleablePanels/toggleablePanelsOptions.d.ts

@@ -0,0 +1,40 @@
+import { Valued, ViewElement } from "../../helpers/types";
+import { PanelTitleOptions } from "../resizablePanels/panelTitle/panelTitleOptions";
+import { PanelSizeFactor, ResizablePanelsItemContent } from "../resizablePanels/resizablePanelsOptions";
+export interface ToggleablePanel {
+    title: PanelTitleOptions;
+    content: ResizablePanelsItemContent;
+    isShown: boolean;
+    toggleButtonOptions?: ToggleablePanelToggleButtonOptions;
+}
+interface ToggleablePanelToggleButtonOptions {
+    title?: Valued<string>;
+}
+export interface ToggleablePanelsToolbarOptions {
+    className?: string;
+    leftZone?: ToolbarZone;
+    rightZone?: ToolbarZone;
+}
+interface ToolbarZone {
+    view: () => ViewElement;
+}
+export declare type ToggleablePanelsRowDirection = "vertical" | "horizontal";
+export interface ToggleableRotatablePanelsOptions {
+    /**
+     * @default "horizontal"
+     */
+    rowDirection?: ToggleablePanelsRowDirection;
+}
+export interface ToggleablePanelsOptions extends ToggleableRotatablePanelsOptions {
+    highlightFocusedPanel?: boolean;
+    panels: PanelsGrid<ToggleablePanel>;
+    toolbar?: ToggleablePanelsToolbarOptions;
+    resizerSize?: number;
+}
+export interface PanelsGrid<T> {
+    rows: {
+        cols: T[];
+        size?: PanelSizeFactor;
+    }[];
+}
+export {};

package/types/helpers/IUi.d.ts

@@ -0,0 +1 @@
+export declare type UiType = "success" | "danger" | "warning" | "info" | "primary" | "fatal";

package/types/helpers/deleteFromArray.d.ts

@@ -0,0 +1 @@
+export declare function deleteFromArray<T = any>(array: T[], item: T): void;

package/types/helpers/events/EventEmitter.d.ts

@@ -0,0 +1,7 @@
+import { AnyObject } from "../types";
+export declare class EventEmitter<E = Record<string, AnyObject>> {
+    private events;
+    subscribe<T extends keyof E>(code: T, listener: (args: E[T]) => void): () => void;
+    unsubscribe<T extends keyof E>(code: T, listener: (args: E[T]) => void): void;
+    emit<T extends keyof E>(code: T, args?: E[T]): void;
+}

package/types/helpers/fireEvent.d.ts

@@ -0,0 +1,4 @@
+export declare const fireEvent: FireEventType;
+declare type FireEventType = (...args: any[]) => any;
+export declare function addDisposableEvent<T extends FireEventType = FireEventType>(event: Array<FireEventType>, callback: T): void;
+export {};

package/types/helpers/pipeline/Pipeline.d.ts

@@ -0,0 +1,20 @@
+import { AnyError } from "../types";
+declare type Next<D> = (args?: D) => void;
+declare type Middleware<D> = (args: D, next: Next<D>) => void | Promise<void>;
+export declare class Pipeline<D = any> {
+    private middlewaresStorage;
+    constructor(middlewares?: Middleware<D>[]);
+    push(middleware: Middleware<D>): () => void;
+    remove(middleware: Middleware<D>): void;
+    execute(args: D, onComplete: (args: D) => void, onError?: (e: AnyError) => void): void;
+    executePromise(args: D): Promise<D>;
+}
+declare type MiddlewareSync<D> = (args: D) => D | undefined;
+export declare class PipelineSync<D = any> {
+    private middlewaresStorage;
+    constructor(middlewares?: MiddlewareSync<D>[]);
+    push(middleware: MiddlewareSync<D>): () => void;
+    remove(middleware: MiddlewareSync<D>): void;
+    execute(args: D): D;
+}
+export {};

package/types/helpers/redraw.d.ts

@@ -0,0 +1,16 @@
+declare type RedrawEventHandler = () => void;
+export interface RedrawFn {
+    (x?: any): void;
+    events: {
+        after?: RedrawEventHandler[];
+        before?: RedrawEventHandler[];
+        beforeOnce: RedrawEventHandler[];
+        afterOnce: RedrawEventHandler[];
+    };
+}
+export declare const uiRedraw: {
+    redrawing: boolean;
+    animating: boolean;
+    redraw: RedrawFn;
+};
+export {};

package/types/helpers/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="../../../../mithril" />
-/// <reference types="mithril" />
+import { UiType } from "./IUi";
 export interface AnyObject {
     [key: string]: any;
 }
@@ -17,22 +17,29 @@ export interface NotifierOptions {
 export interface Notifier {
     notify(title: MessageText, options?: NotifierOptions): void;
 }
+export interface NotifierErrorOptions extends NotifierOptions {
+    error?: Error;
+}
+export interface ErrorNotifier extends Notifier {
+    notify(title: MessageText, options?: NotifierErrorOptions): void;
+}
 export declare type ViewElement = _mithril.MithrilVirtualElement | _mithril.MithrilVirtualElement[] | string;
 export declare type CommandEvent = Event | _mithril.MithrilEvent;
 export declare type InputChangeEvent = Event | _mithril.MithrilEvent;
 export declare type CSSClassName = string;
+export declare type CSSPositionUnit = string;
 export declare type MithrilControl = ViewControl | ContentControl;
 export interface ViewControl {
     $view(): ViewElement | string;
     [key: string]: any;
 }
-export interface ContentControl {
-    content: any;
+export interface ContentControl<C = any> {
+    content: C;
     [key: string]: any;
 }
 export declare type Markdown = string;
 export declare type MessageText = Markdown | string;
-export declare type ColorStyle = "default" | "primary" | "success" | "info" | "warning" | "danger" | "fatal";
+export declare type ColorStyle = UiType | "default";
 export declare type ButtonStyle = ColorStyle;
 export declare type ObjectCode = string;
 export declare type ObjectId = number;
@@ -47,15 +54,20 @@ export declare type Timeout = ReturnType<typeof setTimeout>;
 export declare type MithrilAttributes = _mithril.MithrilAttributes & {
     [name: string]: any;
 };
+export declare type MithrilVirtualElementKey = string | number;
+export declare type HTMLAnchorTarget = "_blank" | "_self" | "_parent" | "_top" | "framename";
+export declare type KeyboardKeyCode = string;
 export declare type AnyError = any;
 export declare type FieldPath = string;
 export declare type FieldId = number;
 export declare type FieldCode = string;
 export declare type FieldKind = "dfk" | "o2m" | "o2o" | "hist" | "dfk-list";
-export declare type KeyboardKeyCode = string;
 export declare type LanguageCode = "ru" | "en";
 export declare type LanguageId = number;
 export declare type GConstructor<T = Record<string, unknown>, A extends Array<any> = any> = new (...args: A) => T;
 export declare type URLString = string;
 export declare type JSONString = string;
+export declare type JavaScriptCodeContent = string;
+export declare type DateString = string;
+export declare type RequestMethod = "POST" | "GET" | string;
 export {};

package/types/helpers/ui/elementModificators/focusableComponent.d.ts

@@ -1,12 +1,14 @@
 /// <reference types="../../../../mithril" />
-/// <reference types="mithril" />
+import { KeyboardKeyCode } from "../../../helpers/types";
 import { ComponentConfigParams } from "./modificatorsTypes";
+export declare function doesKeyPressed(keyCode: KeyboardKeyCode | KeyboardKeyCode[], e: KeyboardEvent): boolean;
 export declare function getFocusableComponentAttrs(): _mithril.MithrilAttributes;
 declare type KeyboardAction = (e: KeyboardEvent) => void;
 export interface KeyboardActions {
     primary?: KeyboardAction;
     secondary?: KeyboardAction;
     clear?: KeyboardAction;
+    cancel?: KeyboardAction;
 }
 export declare function setKeyboardActions(actions: KeyboardActions, configParams: ComponentConfigParams): void;
 export {};

package/types/helpers/ui/keyboardUtils/keyboardUtils.d.ts

@@ -1,4 +1,9 @@
-export declare type KeyCode = string;
+/** KeyboardEvent.code */
+export declare type KeyboardKeyCode = string;
+/** KeyboardEvent.key */
+export declare type KeyboardKeyValue = string;
+/** KeyboardEvent.key, приведенный к числу */
+export declare type KeyboardNumberKeyValue = number;
 interface EventModifierKeys {
     shift: boolean;
     meta: boolean;
@@ -12,5 +17,7 @@ interface KeydownEventKeyCheckingOptions {
     /** @default true */
     checkModifiers?: boolean;
 }
-export declare function checkKeydownEventKeys(e: KeyboardEvent, keyCode: KeyCode, options?: KeydownEventKeyCheckingOptions): boolean;
+export declare function checkKeydownEventKeys(e: KeyboardEvent, keyCode: KeyboardKeyCode, options?: KeydownEventKeyCheckingOptions): boolean;
+/** Получить код клавиши с цифрой */
+export declare function getKeyCodeOfNumberKey(numberKeyValue: KeyboardNumberKeyValue): KeyboardKeyCode;
 export {};

package/types/helpers/utils/keyStorage/KeyStorage.d.ts

@@ -0,0 +1,6 @@
+export interface KeyStorage<T> {
+    get(): T;
+    set(value: T): void;
+    clear(): void;
+}
+export declare type KeyStorageInvalidateKey = number | string;

package/types/helpers/utils/stringifyControlSize.d.ts

@@ -1,3 +1,3 @@
-import { ControlSize } from "mdtScripts/views/controls/Control";
+import { ControlSize } from "../../views/controls/Control";
 export declare type ComponentSize = "small" | "normal" | "large";
 export declare function stringifyControlSize(size: ControlSize): ComponentSize;

package/types/helpers/zone/IZone.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="../../../../mithril" />
-/// <reference types="mithril" />
 import { MithrilControl } from "../types";
 export interface IZone {
     remove(content: MithrilControl): void;

package/types/security/PermissionLevel.d.ts

@@ -1,4 +1,4 @@
-import { IFilterGroup } from "mdtServices/IFilter";
+import { IFilterGroup } from "../services/IFilter";
 import { MdtField } from "../common/MdtField";
 import { MdtObject } from "../common/MdtObject";
 import { Record } from "../common/Record";
@@ -12,6 +12,8 @@ export declare enum PermissionLevel {
     Filter = 32,
     All = 255
 }
+/** Example: "Read, Write, Delete, Add" */
+export declare type PermissionLevelString = string;
 export interface PrincipalPermission extends Record {
     ID_Permission?: number;
     ID_Permission$?: Permission;

package/types/security/User.d.ts

@@ -0,0 +1,30 @@
+import { ObjectId } from "../helpers/types";
+import { PermissionLevel } from "./PermissionLevel";
+export interface User {
+    $id: number;
+    id: any;
+    permissions: {
+        object: {
+            [objectId: ObjectId]: {
+                level: PermissionLevel;
+                fields?: {
+                    [objectId: ObjectId]: {
+                        level: PermissionLevel;
+                    };
+                };
+            };
+        };
+        listview: PermissionLevel;
+        namedfilters: PermissionLevel;
+    };
+    login: string;
+    fullName: string;
+    email?: string;
+    identityName: string;
+    isAdmin: boolean;
+    isAnonymous: boolean;
+    roles: string[];
+    languageId: number;
+    languageCode: string;
+    isImpersonated: boolean;
+}

package/types/services/IFilter.d.ts

@@ -61,7 +61,7 @@ export interface FilterConstructor {
     fulltext(p1: any, p2: any): IFilterItem;
     not(f: any): IFilterItem;
     in(p1: any, ar: any): IFilterIn;
-    queryIn(field: any, table: any, subField: any, filter: any, args?: any): IFilterIn;
+    queryIn(field: any, table: any, subField: any, filter?: any, args?: any): IFilterIn;
     cast(filter: any, cast: any): IFilter;
     equalTemplate(p1: any, p2: any): any;
     empty: any;
@@ -84,7 +84,7 @@ export declare class Filter {
     static fulltext(p1: any, p2: any): IFilterItem;
     static not(f: any): IFilterItem;
     static in(p1: any, ar: any): IFilterIn;
-    static queryIn(field: any, table: any, subField: any, filter: any, args?: any): IFilterIn;
+    static queryIn(field: any, table: any, subField: any, filter?: any, args?: any): IFilterIn;
     static cast(filter: any, cast: any): IFilter;
     static equalTemplate(p1: any, p2: any): IFilter;
     static isFilterGroup(filter: IFilter): filter is IFilterGroup;

package/types/services/ModuleData.d.ts

@@ -1,7 +1,8 @@
+import { ModuleCode } from "../helpers/types";
 import { RecordId } from "../common/Record";
 import { Record } from "../common/Record";
 export interface ModuleData extends Record {
-    Code: string;
+    Code: ModuleCode;
     ID_Package?: RecordId;
     Icon?: string;
     Title?: string;

package/types/services/api/BaseQuery.d.ts

@@ -1,8 +1,8 @@
 import { IFilter } from "../IFilter";
-import { QuerySorting } from "./Query";
+import { QuerySorting } from "./QuerySorting";
 export interface BaseQuery {
     /** Названия выбранных полей */
-    select?: string[];
+    select?: QuerySelect;
     /** Количество записей */
     top?: number;
     /** Фильтр запроса */
@@ -13,3 +13,4 @@ export interface BaseQuery {
     sorting?: QuerySorting[];
     count?: boolean;
 }
+export declare type QuerySelect = string[];