@rentman/rm-core 7.2.0 → 8.0.0

package/dist/types/models/ItemResource.d.ts

@@ -1,25 +1,24 @@
+import { ApiEnumItemType, ApiFields } from '@rentman/backend-types';
 import { TransactionCache } from '../classes';
 import { ItemResourceFactory } from '../factories';
 import { ItemEntry } from '../models';
-import { ColumnIdTypeMap, EntryParentNull, FieldMap, ItemType, PromiseInterface, ResponseColumn } from '../types';
-export declare class ItemResource<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> {
+import { EntryParentNull, ExtractApiItemType, FieldMap, PromiseInterface, ResponseColumnMap } from '../types';
+export declare class ItemResource<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> {
     protected readonly factory: ItemResourceFactory;
     readonly entry: ItemEntry<ItemTypeType>;
     protected readonly _isNew: boolean;
     protected readonly transaction: TransactionCache;
-    columns: {
-        [columnId: string]: ResponseColumn;
-    };
-    fields: FieldMap<ItemTypeType, Fields>;
-    initial: Readonly<FieldMap<ItemTypeType, Fields>>;
+    columns: ResponseColumnMap<ItemTypeType, ColumnIds>;
+    fields: FieldMap<ItemTypeType, ColumnIds>;
+    initial: Readonly<FieldMap<ItemTypeType, ColumnIds>>;
     constructor(factory: ItemResourceFactory, entry: ItemEntry<ItemTypeType>, _isNew: boolean, transaction: TransactionCache);
     onConstruct(): void;
     /**
      * @description
      * Updates the fields of the item and calls onChange, when updating many fields of many items it's better to create a {@link ChangesDelta ChangesDelta} yourself so all changes can be applied at once
      */
-    setFields(values: Partial<Fields>): PromiseInterface<this>;
-    copyFields(destination?: FieldMap<ItemTypeType>): Fields;
+    setFields(values: Partial<FieldMap<ItemTypeType, ColumnIds>>): PromiseInterface<this>;
+    copyFields(destination?: FieldMap<ItemTypeType, []>): FieldMap<ItemTypeType, ColumnIds>;
     /**
      * Fetches the ItemResource's parent with the current fields
      *
@@ -33,7 +32,7 @@ export declare class ItemResource<ItemTypeType extends ItemType = any, Fields ex
      * @deprecated
      * Use {@link TransactionCache.applyChangesDelta transaction.applyChangesDelta} instead
      */
-    callOnChange(previous: Fields): void;
+    callOnChange(previous: FieldMap<ItemTypeType, ColumnIds>): void;
     /**
      * @description
      * Utility function to easily check if a field is changed.
@@ -50,7 +49,7 @@ export declare class ItemResource<ItemTypeType extends ItemType = any, Fields ex
      *     }
      * }
      */
-    compareItemField(columnId: keyof Fields, previous: Fields): boolean;
+    compareItemField(columnId: ColumnIds[number], previous: FieldMap<ItemTypeType, ColumnIds>): boolean;
     hasChanges(): boolean;
     setTransactionParameters(parameters: any): void;
     /**
@@ -61,7 +60,7 @@ export declare class ItemResource<ItemTypeType extends ItemType = any, Fields ex
     isLocal(): boolean;
     toJSON(): {
         columns: string[];
-        fields: Fields;
+        fields: FieldMap<ItemTypeType, ColumnIds>;
         entry: ItemEntry<ItemTypeType>;
     };
     /**
@@ -70,7 +69,10 @@ export declare class ItemResource<ItemTypeType extends ItemType = any, Fields ex
      *
      * @param columnPath Can either be an array of columnIds (['column', 'column2']) or a config column string ('column>column2')
      */
-    getDerivedValue<T extends any = any>(columnPath: string[] | string): T | undefined;
+    getDerivedValue<T1 extends string>(columnPath: T1): any | undefined;
+    getDerivedValue<T1 extends ColumnIds[number]>(columnPath: [T1]): FieldMap<ItemTypeType>[T1] | undefined;
+    getDerivedValue<T1 extends ColumnIds[number], T2 extends keyof ApiFields[ExtractApiItemType<ApiFields[ItemTypeType][T1]>]>(columnPath: [T1, T2]): FieldMap<ExtractApiItemType<ApiFields[ItemTypeType][T1]>>[T2] | undefined;
+    getDerivedValue<T1 extends ColumnIds[number], T2 extends keyof ApiFields[ExtractApiItemType<ApiFields[ItemTypeType][T1]>], T3 extends keyof ApiFields[ExtractApiItemType<ApiFields[ExtractApiItemType<ApiFields[ItemTypeType][T1]>][T2]>]>(columnPath: [T1, T2, T3]): FieldMap<ExtractApiItemType<ApiFields[ExtractApiItemType<ApiFields[ItemTypeType][T1]>][T2]>>[T3] | undefined;
     /**
      * @description
      * Traverses the column path and returns the fields of the derived item, returns undefined if the item isn't found
@@ -80,5 +82,7 @@ export declare class ItemResource<ItemTypeType extends ItemType = any, Fields ex
      * @remark
      * Assumes the derived item's values are already cached
      */
-    getDerivedValues<DerivedFields extends FieldMap = any>(columnPath: string[]): Readonly<DerivedFields> | undefined;
+    getDerivedValues<T1 extends ColumnIds[number]>(columnPath: [T1]): FieldMap<ExtractApiItemType<ApiFields[ItemTypeType][T1]>> | undefined;
+    getDerivedValues<T1 extends ColumnIds[number], T2 extends keyof ApiFields[ExtractApiItemType<ApiFields[ItemTypeType][T1]>]>(columnPath: [T1, T2]): FieldMap<ExtractApiItemType<ApiFields[ExtractApiItemType<ApiFields[ItemTypeType][T1]>][T2]>> | undefined;
+    getDerivedValues<T1 extends ColumnIds[number], T2 extends keyof ApiFields[ExtractApiItemType<ApiFields[ItemTypeType][T1]>], T3 extends keyof ApiFields[ExtractApiItemType<ApiFields[ExtractApiItemType<ApiFields[ItemTypeType][T1]>][T2]>]>(columnPath: [T1, T2, T3]): FieldMap<ExtractApiItemType<ApiFields[ExtractApiItemType<ApiFields[ExtractApiItemType<ApiFields[ItemTypeType][T1]>][T2]>]>> | undefined;
 }

package/dist/types/models/Template.d.ts

@@ -1,11 +1,12 @@
+import { ApiEnumItemType, ApiFields } from '@rentman/backend-types';
 import { ColumnSet } from '../classes';
 import { TemplateFactory } from '../factories';
-import { ApiRequestColumnMap, ApiResponse, ColumnIdTypeMap, FieldMap, ItemType, ResponseColumnItemTypeMap } from '../types';
-export declare class Template<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> {
+import { ApiRequestColumnMap, ApiResponse, FieldMap, ResponseColumnItemTypeMap } from '../types';
+export declare class Template<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = any> {
     itemType: ItemTypeType;
     response: ApiResponse;
     responseColumns: ResponseColumnItemTypeMap;
     columns: ColumnSet<ItemTypeType>;
     constructor(factory: TemplateFactory, itemType: ItemTypeType, response: ApiResponse, additionalRequestColumns: ApiRequestColumnMap, additionalResponseColumns: ResponseColumnItemTypeMap);
-    getFields(): FieldMap<ItemTypeType, Fields>;
+    getFields(): FieldMap<ItemTypeType, ColumnIds>;
 }

package/dist/types/types/ItemTypesCollection.d.ts

@@ -1,26 +1,89 @@
+import { ApiEnumApiType, ApiEnumApiTypeTsTypeMapping, ApiEnumItemType, ApiFields, ApiQuery as BackendApiQuery, ApiQueryConditionComparator as BackendTypesApiQueryConditionComparator, ApiQueryConditionComparatorShort as BackendApiQueryConditionComparatorShort, ApiQueryConditionCustom, ApiQueryConditionIn, ApiQueryConditionInShort, ApiQueryConditionLinkedTo, ApiQueryConditionSearch, ApiQueryConditionSubQuery, GetColumnType, ItemId } from '@rentman/backend-types';
+import moment from 'moment';
 import { ApiResponseProcessor, ColumnSet, RequestColumnExpansion } from '../classes';
 import { CollectionResource, ItemEntry, ItemEntryOptionsInterface, ItemResource } from '../models';
 import { CollectionOptions } from '../models/CollectionOptions';
+export declare type ApiEnumApiTypeToTsTypeMap = {
+    [ApiEnumApiType.TYPE_TOKEN]: string;
+    [ApiEnumApiType.TYPE_ID]: number;
+    [ApiEnumApiType.TYPE_ORDER]: number;
+    [ApiEnumApiType.TYPE_PARENTID]: number;
+    [ApiEnumApiType.TYPE_PARENTTYPE]: ApiEnumItemType;
+    [ApiEnumApiType.TYPE_ITEMID]: number;
+    [ApiEnumApiType.TYPE_ITEMTYPE]: ApiEnumItemType;
+    [ApiEnumApiType.TYPE_PASSWORD]: string;
+    [ApiEnumApiType.TYPE_IP]: string;
+    [ApiEnumApiType.TYPE_COORDINATE]: number;
+    [ApiEnumApiType.TYPE_BLOB]: string;
+    [ApiEnumApiType.TYPE_BITFLAG]: number;
+    [ApiEnumApiType.TYPE_NUMBER]: number;
+    [ApiEnumApiType.TYPE_VOLUME]: number;
+    [ApiEnumApiType.TYPE_WEIGHT]: number;
+    [ApiEnumApiType.TYPE_DISTANCE]: number;
+    [ApiEnumApiType.TYPE_DIMENSION]: number;
+    [ApiEnumApiType.TYPE_QUANTITY]: number;
+    [ApiEnumApiType.TYPE_POWER]: number;
+    [ApiEnumApiType.TYPE_CURRENT]: number;
+    [ApiEnumApiType.TYPE_DOUBLE]: number;
+    [ApiEnumApiType.TYPE_PRICE]: number;
+    [ApiEnumApiType.TYPE_BOOL]: boolean;
+    [ApiEnumApiType.TYPE_INT]: number;
+    [ApiEnumApiType.TYPE_EMAIL]: string;
+    [ApiEnumApiType.TYPE_PHONE]: string;
+    [ApiEnumApiType.TYPE_URL]: string;
+    [ApiEnumApiType.TYPE_PERCENTAGE]: number;
+    [ApiEnumApiType.TYPE_TEXT]: string;
+    [ApiEnumApiType.TYPE_LONGTEXT]: string;
+    [ApiEnumApiType.TYPE_HTML]: string;
+    [ApiEnumApiType.TYPE_DATE]: moment.Moment;
+    [ApiEnumApiType.TYPE_DATETIME]: moment.Moment;
+    [ApiEnumApiType.TYPE_DURATION]: moment.Duration;
+    [ApiEnumApiType.TYPE_ITEM]: number;
+    [ApiEnumApiType.TYPE_LINK]: number;
+    [ApiEnumApiType.TYPE_CHILD]: number;
+    [ApiEnumApiType.TYPE_SIBLING]: number;
+    [ApiEnumApiType.TYPE_JSON]: any;
+    [ApiEnumApiType.TYPE_ENUM]: string;
+    [ApiEnumApiType.TYPE_COUNTRY]: string;
+    [ApiEnumApiType.TYPE_COLOR]: string;
+    [ApiEnumApiType.TYPE_TEXTREPLACE]: string;
+    [ApiEnumApiType.TYPE_FILESIZE]: number;
+    [ApiEnumApiType.TYPE_ICON]: string;
+};
 export declare type ParentIdMap<T> = {
     [parentId: number]: T;
 };
-export declare type EntryParent = {
-    itemType: string;
-    itemId: number;
+export declare type EntryParent<ItemTypeType extends ApiEnumItemType = any> = {
+    itemType: ItemTypeType;
+    itemId: ItemId;
 };
-export declare type EntryParentNull = EntryParent | null;
-/**
- * @description
- * Used for fields that belong to a specific itemType
- */
-export declare type FieldMap<_ItemTypeType extends ItemType = any, Values = ColumnIdTypeMap> = Values;
-export declare type ColumnIdTypeMap<Fields extends object = any> = Fields;
+export declare type EntryParentNull<ItemTypeType extends ApiEnumItemType = any> = EntryParent<ItemTypeType> | null;
+export declare type FieldMap<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = {
+    [ColumnId in ColumnIds[number]]: GetFieldValueType<ItemTypeType, ColumnId>;
+};
+export declare type ExtractApiType<T> = T extends {
+    type: any;
+} ? T['type'] : never;
+export declare type ExtractApiEnum<T> = T extends {
+    enum: any;
+} ? T['enum'] : never;
+export declare type ExtractApiItemType<T> = T extends {
+    itemType: any;
+} ? T['itemType'] : never;
+export declare type ExtractApiNullable<T> = T extends {
+    nullable: any;
+} ? T['nullable'] : never;
+export declare type ExtractApiFieldType<T> = T extends {
+    type: keyof ApiEnumApiTypeToTsTypeMap;
+} ? ApiEnumApiTypeToTsTypeMap[T['type']] : never;
+export declare type GetFieldValueType<ItemTypeType extends ApiEnumItemType, ColumnId extends keyof ApiFields[ItemTypeType]> = ExtractApiType<ApiFields[ItemTypeType][ColumnId]> extends ApiEnumApiType.TYPE_ENUM ? keyof ExtractApiEnum<ApiFields[ItemTypeType][ColumnId]> : GetNullableValueType<ItemTypeType, ColumnId>;
+declare type GetNullableValueType<ItemTypeType extends ApiEnumItemType, ColumnId extends keyof ApiFields[ItemTypeType]> = ExtractApiNullable<ApiFields[ItemTypeType][ColumnId]> extends false ? ExtractApiFieldType<ApiFields[ItemTypeType][ColumnId]> : ExtractApiType<ApiFields[ItemTypeType][ColumnId]> extends ApiEnumApiType.TYPE_DATETIME ? ExtractApiFieldType<ApiFields[ItemTypeType][ColumnId]> : ExtractApiType<ApiFields[ItemTypeType][ColumnId]> extends ApiEnumApiType.TYPE_DATE ? ExtractApiFieldType<ApiFields[ItemTypeType][ColumnId]> : ExtractApiType<ApiFields[ItemTypeType][ColumnId]> extends ApiEnumApiType.TYPE_DURATION ? ExtractApiFieldType<ApiFields[ItemTypeType][ColumnId]> : null | ExtractApiFieldType<ApiFields[ItemTypeType][ColumnId]>;
 export declare type ItemOptionsInterface = ItemEntryOptionsInterface;
-export interface CollectionDefinition<ItemTypeType extends ItemType = any> {
+export interface CollectionDefinition<ItemTypeType extends ApiEnumItemType = any> {
     itemType: ItemTypeType;
     options: CollectionOptions;
 }
-export interface LinkCollectionDefinition<ItemTypeType extends ItemType = any> extends CollectionDefinition<ItemTypeType> {
+export interface LinkCollectionDefinition<ItemTypeType extends ApiEnumItemType = any> extends CollectionDefinition<ItemTypeType> {
     linkField: string;
 }
 export declare enum StateKeyType {
@@ -30,7 +93,7 @@ export declare enum StateKeyType {
 export declare type StateKey = {
     type: StateKeyType;
     template?: string;
-    itemId?: number;
+    itemId?: ItemId;
 };
 export declare type SocketMessageType = 'event' | 'notification';
 export interface SocketMessage {
@@ -53,14 +116,19 @@ export interface SocketMessage {
         sent: string;
         forceEvaluate: boolean;
     };
-    body: any;
+    body: {
+        itemType: ApiEnumItemType;
+        eventType: string;
+    } & {
+        [key: string]: any;
+    };
     messageType: SocketMessageType;
 }
 export interface SocketMessageCreate extends SocketMessage {
     body: {
         eventType: 'create';
         columns: ResponseColumnItemTypeMap;
-        itemType: ItemType;
+        itemType: ApiEnumItemType;
         items: {
             [itemType: string]: {
                 [itemId: number]: {
@@ -75,7 +143,7 @@ export interface SocketMessageUpdate extends SocketMessage {
     body: {
         eventType: 'update';
         columns: ResponseColumnItemTypeMap;
-        itemType: ItemType;
+        itemType: ApiEnumItemType;
         items: {
             [itemType: string]: {
                 [itemId: number]: {
@@ -90,7 +158,7 @@ export interface SocketMessageLinkTo extends SocketMessage {
     body: {
         eventType: 'linkto';
         columns: ResponseColumnItemTypeMap;
-        itemType: ItemType;
+        itemType: ApiEnumItemType;
         items: {
             [itemType: string]: {
                 [itemId: number]: {
@@ -104,13 +172,15 @@ export interface SocketMessageLinkTo extends SocketMessage {
 export interface SocketMessageDelete extends SocketMessage {
     body: {
         eventType: 'delete';
-        itemType: ItemType;
+        itemType: ApiEnumItemType;
         items: ItemId[];
     };
 }
 export interface FunctionChangesResolveSocketMessage extends SocketMessage {
     body: {
-        itemType: 'FunctionChangesResolve';
+        itemType: ApiEnumItemType.FunctionChangesResolve;
+        eventType: 'update';
+    } & {
         [key: string]: any;
     };
 }
@@ -120,15 +190,13 @@ export declare type ItemResourceItemIdMap<T extends ItemResource = ItemResource>
 export declare type ItemResourcesItemTypeMap<T extends ItemResource = ItemResource> = {
     [itemType: string]: T[];
 };
-export declare type ItemId = number;
-export declare type ItemType = string;
 export declare type ItemMap<T> = {
     [itemType: string]: {
         [itemId: string]: T;
     };
 };
-export declare type ItemEntryMap<ItemTypeType extends ItemType> = ItemMap<ItemEntry<ItemTypeType>>;
-export declare type ItemEntryParentIdMap<ItemTypeType extends ItemType> = ParentIdMap<Array<ItemEntry<ItemTypeType>>>;
+export declare type ItemEntryMap<ItemTypeType extends ApiEnumItemType = any> = ItemMap<ItemEntry<ItemTypeType>>;
+export declare type ItemEntryParentIdMap<ItemTypeType extends ApiEnumItemType> = ParentIdMap<Array<ItemEntry<ItemTypeType>>>;
 export declare type ConversionMap = {
     [itemId: number]: number;
 };
@@ -140,24 +208,23 @@ export declare type ItemError = {
     message: string;
 };
 export declare type CollectionQuery = {
-    object: object;
+    object: BackendApiQuery;
     string: string;
 };
-export declare type CollectionResourceParentIdMap<ItemTypeType extends ItemType = any> = ParentIdMap<CollectionResource<ItemTypeType>>;
-export declare type ResponseColumn = any;
-export declare type ResponseColumnMap = {
-    [columnId: string]: ResponseColumn;
+export declare type CollectionResourceParentIdMap<ItemTypeType extends ApiEnumItemType = any> = ParentIdMap<CollectionResource<ItemTypeType>>;
+export declare type ResponseColumnMap<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = any> = {
+    [ColumnId in ColumnIds[number]]: GetColumnType<ItemTypeType, ColumnId>;
 };
 export declare type ResponseColumnItemTypeMap = {
     [itemType: string]: ResponseColumnMap;
 };
-export declare type ColumnExpansionResult<ItemTypeType extends ItemType = any> = {
+export declare type ColumnExpansionResult<ItemTypeType extends ApiEnumItemType = any> = {
     merged: ColumnSet<ItemTypeType>;
     difference: ColumnSet<ItemTypeType>;
 };
-export declare type RootColumnMap = {
-    [columnId: string]: {
-        apiColumn: ResponseColumn;
+export declare type RootColumnMap<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = any> = {
+    [ColumnId in ColumnIds[number]]: {
+        apiColumn: GetColumnType<ItemTypeType, ColumnId>;
         children: RootColumnMap;
     };
 };
@@ -169,7 +236,6 @@ export declare type TemplateItemResourceMap<T extends ItemResource<any>> = {
 export declare type ItemTypeMap<T = any> = {
     [itemType: string]: T;
 };
-export declare type ApiQuery = any;
 export declare type ApiRequestItemValues = {
     values?: any;
     links?: {
@@ -196,11 +262,11 @@ export declare type ApiRequestLimit = {
 export declare type ApiRequestMoveItems = {
     [itemType: string]: ItemId[];
 };
-export declare type CreateRequestEntry<ItemTypeType extends ItemType> = {
+export declare type CreateRequestEntry<ItemTypeType extends ApiEnumItemType> = {
     request: {
         requestType: 'create';
         itemType?: ItemTypeType;
-        parentType?: ItemType;
+        parentType?: ApiEnumItemType;
         parentId?: {
             [itemId: string]: ItemId;
         };
@@ -214,12 +280,14 @@ export declare enum ApiLinkTreeType {
     ITEMTABLE = "itemtable",
     DIRECT = "direct"
 }
-export declare type ApiLinkTreeEntry = {
+export declare type ApiLinkTreeEntryItemTable = {
     type: ApiLinkTreeType.ITEMTABLE;
-} | {
+};
+export declare type ApiLinkTreeEntryDirect = {
     type: ApiLinkTreeType.DIRECT;
     field: string;
 };
+export declare type ApiLinkTreeEntry = ApiLinkTreeEntryItemTable | ApiLinkTreeEntryDirect;
 export declare type ApiLinkTree = {
     [itemType: string]: {
         [childType: string]: ApiLinkTreeEntry;
@@ -229,34 +297,49 @@ export declare type ApiLinkTree = {
  * @description
  * Callback to determine if an item should be included in the create delta, return `false` to exclude the item
  */
-export declare type FilterItemEntryCallback = <ItemTypeType extends ItemType, Fields extends ColumnIdTypeMap = any>(itemType: ItemTypeType, fields: FieldMap<ItemTypeType, Fields>) => boolean;
-export declare type ModifyFieldsCallback = <ItemTypeType extends ItemType, Fields extends ColumnIdTypeMap = any>(itemType: ItemTypeType, fields: FieldMap<ItemTypeType, Fields>, itemIdConversionMap?: ItemIdConversionMap) => void;
+export declare type FilterItemEntryCallback<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = (itemType: ItemTypeType, fields: FieldMap<ItemTypeType, ColumnIds>) => boolean;
+export declare type ModifyFieldsCallback<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = (itemType: ItemTypeType, fields: FieldMap<ItemTypeType, ColumnIds>, itemIdConversionMap?: ItemIdConversionMap) => void;
 /**
  * @description
  * Returns 'false' if the field changed
  */
-export declare type CompareFieldCallback<Fields extends ColumnIdTypeMap, T extends keyof Fields = string> = (field: T) => boolean;
-export declare type FieldChangeCallbackArgs<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> = {
+export declare type CompareFieldCallback<Fields extends FieldMap, T extends keyof Fields = string> = (field: T) => boolean;
+export declare type FieldChangeCallbackArgs<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = {
     itemEntry: ItemEntry<ItemTypeType>;
-    compareField: CompareFieldCallback<Fields>;
-    fields: FieldMap<ItemTypeType, Fields>;
+    compareField: CompareFieldCallback<ColumnIds>;
+    fields: FieldMap<ItemTypeType, ColumnIds>;
     isCalledAfterSocketUpdate: boolean;
-    previous: FieldMap<ItemTypeType, Fields>;
+    previous: FieldMap<ItemTypeType, ColumnIds>;
 };
-export declare type FieldChangeCallback<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> = (args: FieldChangeCallbackArgs<ItemTypeType, Fields>) => void;
+export declare type FieldChangeCallback<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = (args: FieldChangeCallbackArgs<ItemTypeType, ColumnIds>) => void;
 export declare type DeregFunction = () => void;
-export declare type OnChangeCallbackArgs<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> = FieldChangeCallbackArgs<ItemTypeType, Fields>;
-export declare type OnChangeCallback<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> = FieldChangeCallback<ItemTypeType, Fields>;
-export declare type OnAddCallbackArgs<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> = {
-    itemResources: Array<ItemResource<ItemTypeType, Fields>>;
-    collectionResource: CollectionResource<ItemTypeType, Fields>;
+export declare type OnChangeCallbackArgs<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = FieldChangeCallbackArgs<ItemTypeType, ColumnIds>;
+export declare type OnChangeCallback<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = FieldChangeCallback<ItemTypeType, ColumnIds>;
+export declare type OnAddCallbackArgs<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = {
+    itemResources: Array<ItemResource<ItemTypeType, ColumnIds>>;
+    collectionResource: CollectionResource<ItemTypeType, ColumnIds>;
     isInitialCall: boolean;
     isCalledAfterSocketUpdate: boolean;
 };
-export declare type OnAddCallback<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> = (args: OnAddCallbackArgs<ItemTypeType, Fields>) => void;
-export declare type OnRemoveCallbackArgs<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> = {
-    itemResources: Array<ItemResource<ItemTypeType, Fields>>;
-    collectionResource: CollectionResource<ItemTypeType, Fields>;
+export declare type OnAddCallback<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = (args: OnAddCallbackArgs<ItemTypeType, ColumnIds>) => void;
+export declare type OnRemoveCallbackArgs<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = {
+    itemResources: Array<ItemResource<ItemTypeType, ColumnIds>>;
+    collectionResource: CollectionResource<ItemTypeType, ColumnIds>;
     isCalledAfterSocketUpdate: boolean;
 };
-export declare type OnRemoveCallback<ItemTypeType extends ItemType = any, Fields extends ColumnIdTypeMap = any> = (args: OnRemoveCallbackArgs<ItemTypeType, Fields>) => void;
+export declare type OnRemoveCallback<ItemTypeType extends ApiEnumItemType = any, ColumnIds extends Array<keyof ApiFields[ItemTypeType]> = Array<keyof ApiFields[ItemTypeType]>> = (args: OnRemoveCallbackArgs<ItemTypeType, ColumnIds>) => void;
+/************************************/
+export declare type ApiQueryConditionComparatorShort<ItemTypeType extends ApiEnumItemType = any, ColumnId extends keyof ApiFields[ItemTypeType] = any> = BackendApiQueryConditionComparatorShort<ItemTypeType, ColumnId> & {
+    [_T in ColumnId]: 'NOW' | ApiEnumApiTypeTsTypeMapping[ExtractApiType<ApiFields[ItemTypeType][ColumnId]>];
+};
+export interface ApiQueryConditionComparator<ItemTypeType extends ApiEnumItemType = any, ColumnId extends keyof ApiFields[ItemTypeType] = keyof ApiFields[ItemTypeType]> extends BackendTypesApiQueryConditionComparator {
+    value: 'NOW' | ApiEnumApiTypeTsTypeMapping[ExtractApiType<ApiFields[ItemTypeType][ColumnId]>];
+}
+declare type ApiQueryCondition<ItemTypeType extends ApiEnumItemType, ColumnId extends keyof ApiFields[ItemTypeType]> = ApiQueryConditionComparatorShort<ItemTypeType, ColumnId> | ApiQueryConditionComparator<ItemTypeType, ColumnId> | ApiQueryConditionIn<ItemTypeType, ColumnId> | ApiQueryConditionInShort<ItemTypeType, ColumnId> | ApiQueryConditionLinkedTo | ApiQueryConditionSubQuery<ItemTypeType> | ApiQueryConditionSearch | ApiQueryConditionCustom;
+export declare type ApiQueryWithConditions<ItemTypeType extends ApiEnumItemType = any> = {
+    operator?: 'and' | 'AND' | 'or' | 'OR';
+    conditions: Array<ApiQuery<ItemTypeType>>;
+    not?: boolean;
+};
+export declare type ApiQuery<ItemTypeType extends ApiEnumItemType = any, ColumnId extends keyof ApiFields[ItemTypeType] = any> = ApiQueryWithConditions<ItemTypeType> | ApiQueryCondition<ItemTypeType, ColumnId>;
+export {};

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@rentman/rm-core",
-  "version": "7.2.0",
+  "version": "8.0.0",
   "description": "Rentman core functionalities",
   "main": "./dist/rm-core.js",
   "types": "./dist/types/index.d.ts",
-  "dependencies": {},
+  "dependencies": {
+    "@rentman/backend-types": "0.0.7"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/rentmanpublic/frontend-core"
@@ -15,7 +17,7 @@
     "clean-webpack-plugin": "^0.1.19",
     "ts-loader": "^6.2.1",
     "tslint": "5.19.0",
-    "typescript": "^3.7.2",
+    "typescript": "^3.9.2",
     "typescript-tslint-plugin": "^0.5.5",
     "uglifyjs-webpack-plugin": "^1.2.5",
     "webpack": "4.41.2",