@rentman/rm-core 1.5.7-1 → 1.5.7

package/dist/src/classes/CollectionHandler.d.ts

@@ -36,8 +36,8 @@ export declare class CollectionHandler {
      */
     addToCollections<T extends CollectionResource = CollectionViewResource>(collectionMap: any, updateInitial: boolean, resultResource?: T | null): T['items'];
     batchExpand(parentType: ItemType, itemType: ItemType, collections: CollectionResourceParentIdMap, newColumns: ApiRequestColumn[]): PromiseInterface<CollectionResourceParentIdMap>;
-    batchExtend<T extends CollectionResourceParentIdMap>(parentType: ItemType, itemType: ItemType, options: CollectionEntryOptions, queryCallback: QueryCallback, collections: T, returnAllItems?: boolean): PromiseInterface<ItemResourceItemIdMap>;
-    batchFetch(parentType: ItemType, parentIdArray: ItemId[] | (() => ItemId[]), itemType: ItemType, options: CollectionEntryOptions, itemCache: ItemCache, localCollectionCache: CollectionCache, deferredCollectionCache: CollectionCache): PromiseInterface<CollectionEntryParentIdMap>;
+    batchExtend(parentType: ItemType, itemType: ItemType, options: CollectionEntryOptions, queryCallback: QueryCallback, collections: CollectionResourceParentIdMap, returnAllItems?: boolean): PromiseInterface<ItemResourceItemIdMap>;
+    batchFetch(parentType: ItemType, parentIdArray: ItemId[], itemType: ItemType, options: CollectionEntryOptions, itemCache: ItemCache, localCollectionCache: CollectionCache, deferredCollectionCache: CollectionCache): PromiseInterface<CollectionEntryParentIdMap>;
     handleBatchResponse(batchStatus: BatchStatus<CollectionEntry>, itemEntryCompound: {
         columns: ColumnSet;
         columnExpansion?: ColumnExpansion;

package/dist/src/classes/ItemAdministrator.d.ts

@@ -1,8 +1,8 @@
-import { CollectionCache, CollectionHandler, CollectionMatcher, ItemCache, ItemHandler, ItemRequestService, KeyService, LocalCache, ModuleChangesCompilationResult, QueryService } from '../classes';
+import { CollectionCache, CollectionHandler, CollectionMatcher, ItemCache, ItemHandler, ItemRequestService, KeyService, LocalCache, QueryService } from '../classes';
 import { CollectionMatcherFactory, ColumnSetFactory, LocalCacheFactory, ModuleChangesCompilationFactory } from '../factories';
 import { ApiRequestServiceInterface, AuthInterface, ErrorHandlerInterface, LocalCacheManagerInterface, PromiseLibraryInterface } from '../interfaces';
 import { CollectionEditResource, CollectionEntry, CollectionResource, CollectionResourceOptionsInterface, CollectionViewResource, EditResource, ItemEntry, ItemResource, ItemResourceOptionsInterface, ViewResource } from '../models';
-import { ApiQuery, CollectionDefinition, CollectionOptionsInterface, CollectionResourceParentIdMap, ConversionMap, CreateRequestParameterMap, ItemId, ItemIdConversionMap, ItemOptionsInterface, ItemResourcesItemTypeMap, ItemType, LinkCollectionDefinition, LinkedItemEntryMap, LocalCacheCallbackCondition, OnSaveCallback, PromiseInterface } from '../types';
+import { ApiQuery, CollectionDefinition, CollectionOptionsInterface, CollectionResourceParentIdMap, ConversionMap, CreateRequestParameterMap, ItemId, ItemIdConversionMap, ItemOptionsInterface, ItemResourcesItemTypeMap, ItemType, LinkCollectionDefinition, LinkedItemEntryMap, LocalCacheCallbackCondition, OnSaveCallback, PromiseInterface, TemplateItemResourceMap } from '../types';
 export declare class ItemAdministrator {
     private apiRequestService;
     private authInterface;
@@ -33,14 +33,8 @@ export declare class ItemAdministrator {
         linked: ItemResourcesItemTypeMap;
     }>;
     getNewResource(itemType: ItemType, options: ItemOptionsInterface, returnLinks?: boolean, isRoot?: boolean): PromiseInterface<EditResource>;
-    getDuplicateById(itemType: ItemType, duplicateId: ItemId, options: ItemOptionsInterface & {
-        edit: true;
-    }, returnLinks?: boolean, isRoot?: boolean): PromiseInterface<EditResource>;
-    getDuplicateById(itemType: ItemType, duplicateId: ItemId, options: ItemOptionsInterface, returnLinks?: boolean, isRoot?: boolean): PromiseInterface<ViewResource>;
-    getItemByState(itemType: ItemType, stateKey: ItemId | string, options: ItemOptionsInterface & {
-        edit: true;
-    }, isRoot?: boolean): PromiseInterface<EditResource>;
-    getItemByState(itemType: ItemType, stateKey: ItemId | string, options: ItemOptionsInterface, isRoot?: boolean): PromiseInterface<ViewResource>;
+    getDuplicateById(itemType: ItemType, duplicateId: ItemId, options?: ItemOptionsInterface, returnLinks?: boolean, isRoot?: boolean): PromiseInterface<ItemResource | TemplateItemResourceMap>;
+    getItemByState(itemType: ItemType, stateKey: ItemId | string, options?: ItemOptionsInterface, isRoot?: boolean): PromiseInterface<ItemResource>;
     getCollectionDef(itemType: ItemType, options: CollectionOptionsInterface): CollectionDefinition;
     getLinkCollectionsDef(linkType: ItemType, linkIdArray: ItemId[] | (() => ItemId[]), itemType: ItemType, linkField: string, options: CollectionOptionsInterface): LinkCollectionDefinition;
     getCollection(itemType: ItemType, options: CollectionOptionsInterface & {
@@ -59,48 +53,18 @@ export declare class ItemAdministrator {
      * @deprecated, use `parent` in options
      */
     getLinkCollection(linkType: ItemType, linkId: ItemId, itemType: ItemType, options?: CollectionOptionsInterface): PromiseInterface<CollectionResource>;
-    getLinkCollections(linkType: ItemType, linkIdArray: ItemId[], itemType: ItemType, options: CollectionOptionsInterface & {
-        editItems: true;
-        editCollection: true;
-    }): PromiseInterface<CollectionResourceParentIdMap<CollectionEditResource<EditResource>>>;
-    getLinkCollections(linkType: ItemType, linkIdArray: ItemId[], itemType: ItemType, options: CollectionOptionsInterface & {
-        editCollection: true;
-    }): PromiseInterface<CollectionResourceParentIdMap<CollectionEditResource<ViewResource>>>;
-    getLinkCollections(linkType: ItemType, linkIdArray: ItemId[], itemType: ItemType, options: CollectionOptionsInterface & {
-        editItems: true;
-    }): PromiseInterface<CollectionResourceParentIdMap<CollectionViewResource<EditResource>>>;
-    getLinkCollections(linkType: ItemType, linkIdArray: ItemId[], itemType: ItemType, options: CollectionOptionsInterface): PromiseInterface<CollectionResourceParentIdMap<CollectionViewResource<ViewResource>>>;
-    getLinkCollectionsFromDef(definition: LinkCollectionDefinition): PromiseInterface<CollectionResourceParentIdMap>;
-    getAllLinkCollections(linkType: ItemType, itemType: ItemType, options: CollectionOptionsInterface & {
-        editItems: true;
-        editCollection: true;
-    }): PromiseInterface<CollectionResourceParentIdMap<CollectionEditResource<EditResource>>>;
-    getAllLinkCollections(linkType: ItemType, itemType: ItemType, options: CollectionOptionsInterface & {
-        editCollection: true;
-    }): PromiseInterface<CollectionResourceParentIdMap<CollectionEditResource<ViewResource>>>;
-    getAllLinkCollections(linkType: ItemType, itemType: ItemType, options: CollectionOptionsInterface & {
-        editItems: true;
-    }): PromiseInterface<CollectionResourceParentIdMap<CollectionViewResource<EditResource>>>;
-    getAllLinkCollections(linkType: ItemType, itemType: ItemType, options: CollectionOptionsInterface): PromiseInterface<CollectionResourceParentIdMap<CollectionViewResource<ViewResource>>>;
+    getLinkCollections(linkType: ItemType, linkIdArray: ItemId[], itemType: ItemType, options: CollectionOptionsInterface): PromiseInterface<CollectionResourceParentIdMap>;
+    getLinkCollectionsFromDef(definition: any): PromiseInterface<CollectionResourceParentIdMap>;
+    getAllLinkCollections(linkType: ItemType, itemType: ItemType, options: CollectionOptionsInterface): PromiseInterface<CollectionResourceParentIdMap>;
     cloneItem(itemResource: ItemResource, options: ItemOptionsInterface & {
         edit: true;
     }): EditResource;
     cloneItem(itemResource: ItemResource, options: ItemOptionsInterface): ViewResource;
-    cloneCollection(collectionResource: CollectionResource, options: CollectionOptionsInterface & {
-        editItems: true;
-        editCollection: true;
-    }, conversionMap: ItemIdConversionMap): CollectionEditResource<EditResource>;
-    cloneCollection(collectionResource: CollectionResource, options: CollectionOptionsInterface & {
-        editItems: true;
-    }, conversionMap: ItemIdConversionMap): CollectionViewResource<EditResource>;
-    cloneCollection(collectionResource: CollectionResource, options: CollectionOptionsInterface & {
-        editCollection: true;
-    }, conversionMap: ItemIdConversionMap): CollectionEditResource<ViewResource>;
     cloneCollection(collectionResource: CollectionResource, options: CollectionOptionsInterface, conversionMap: ItemIdConversionMap): CollectionViewResource<ViewResource>;
     saveCurrentLocalCache(closeTab?: boolean, parameters?: CreateRequestParameterMap, breakupByParent?: boolean, onAfterCreateCallback?: (conversionMap: ItemIdConversionMap) => void): PromiseInterface<ItemIdConversionMap>;
     getCurrentCollections(): CollectionCache;
     getCurrentItems(): ItemCache;
-    getModuleChanges(localCache?: LocalCache): ModuleChangesCompilationResult;
+    getModuleChanges(localCache?: LocalCache): import("./ModuleChangesCompilation").ModuleChangesCompilationResult;
     addSingleItem(itemEntry: ItemEntry, options: ItemResourceOptionsInterface & {
         edit: true;
     }, isRoot?: boolean, localCache?: LocalCache): EditResource;
@@ -121,14 +85,8 @@ export declare class ItemAdministrator {
     }): CollectionEditResource<ViewResource>;
     addCollection(collectionEntry: CollectionEntry, options: CollectionResourceOptionsInterface): CollectionViewResource<ViewResource>;
     private createItemResources;
-    processLinkedItems(linkedEntries: LinkedItemEntryMap[], options: ItemOptionsInterface & {
-        edit: true;
-    }, addToCollections: boolean): ItemResourcesItemTypeMap<EditResource>;
-    processLinkedItems(linkedEntries: LinkedItemEntryMap[], options: ItemOptionsInterface, addToCollections: boolean): ItemResourcesItemTypeMap<ViewResource>;
-    expandProcessLinkedItems(linkedEntries: LinkedItemEntryMap[], options: ItemOptionsInterface & {
-        edit: true;
-    }): PromiseInterface<ItemResourcesItemTypeMap<EditResource>>;
-    expandProcessLinkedItems(linkedEntries: LinkedItemEntryMap[], options: ItemOptionsInterface): PromiseInterface<ItemResourcesItemTypeMap<ViewResource>>;
+    processLinkedItems(linkedEntries: LinkedItemEntryMap[], options: ItemOptionsInterface, addToCollections?: boolean): ItemResourcesItemTypeMap;
+    expandProcessLinkedItems(linkedEntries: LinkedItemEntryMap[], options: ItemOptionsInterface): PromiseInterface<ItemResourcesItemTypeMap>;
     private constructOnItemsExpanded;
     private expandAddToCollections;
     private getColumnSuperset;

package/dist/src/classes/LocalCache.d.ts

@@ -2,7 +2,7 @@ import { CollectionCache, ItemCache, LockService } from '../classes';
 import { ChangesProcessorFactory, CollectionCacheFactory, CollectionResourceFactory, ItemCacheFactory, ItemResourceFactory } from '../factories';
 import { ErrorHandlerInterface, PromiseLibraryInterface } from '../interfaces';
 import { CollectionEditResource, CollectionEntry, CollectionResource, CollectionResourceOptionsInterface, CollectionViewResource, EditResource, ItemEntry, ItemResource, ViewResource } from '../models';
-import { CollectionEntryParentIdMap, CollectionResourceParentIdMap, CreateRequestParameterMap, ItemIdConversionMap, ItemOptionsInterface, LocalCacheCallbackCondition, OnSaveCallback, PromiseInterface } from '../types';
+import { CollectionEntryParentIdMap, CreateRequestParameterMap, ItemIdConversionMap, ItemOptionsInterface, LocalCacheCallbackCondition, OnSaveCallback, PromiseInterface } from '../types';
 export declare class LocalCache {
     private errorHandler;
     private lockService;
@@ -42,17 +42,9 @@ export declare class LocalCache {
         editItems: true;
     }): CollectionViewResource<EditResource>;
     createCollectionResource(collectionEntry: CollectionEntry, resourceOptions: CollectionResourceOptionsInterface): CollectionViewResource<ViewResource>;
-    createCollectionResources(collectionEntries: CollectionEntryParentIdMap, resourceOptions: CollectionResourceOptionsInterface & {
-        editItems: true;
-        editCollection: true;
-    }): CollectionResourceParentIdMap<CollectionEditResource<EditResource>>;
-    createCollectionResources(collectionEntries: CollectionEntryParentIdMap, resourceOptions: CollectionResourceOptionsInterface & {
-        editCollection: true;
-    }): CollectionResourceParentIdMap<CollectionEditResource<ViewResource>>;
-    createCollectionResources(collectionEntries: CollectionEntryParentIdMap, resourceOptions: CollectionResourceOptionsInterface & {
-        editItems: true;
-    }): CollectionResourceParentIdMap<CollectionViewResource<EditResource>>;
-    createCollectionResources(collectionEntries: CollectionEntryParentIdMap, resourceOptions: CollectionResourceOptionsInterface): CollectionResourceParentIdMap<CollectionViewResource<ViewResource>>;
+    createCollectionResources(collectionEntries: CollectionEntryParentIdMap, resourceOptions: CollectionResourceOptionsInterface): {
+        [parentId: string]: CollectionResource;
+    };
     clearItem(itemResource: ItemResource): void;
     clearItemEntry(itemEntry: ItemEntry): void;
     clearCollection(collectionResource: CollectionResource): void;

package/dist/src/classes/Util.d.ts

@@ -18,7 +18,7 @@ export declare function isString(value: any): boolean;
 export declare function isNumber(value: any): boolean;
 export declare function isDate(value: any): boolean;
 export declare const isArray: (arg: any) => arg is any[];
-export declare function isFunction<T>(value: any): value is T;
+export declare function isFunction(value: any): boolean;
 export declare function isRegExp(value: any): boolean;
 export declare function isBoolean(value: any): boolean;
 export declare function isElement(node: any): boolean;

package/dist/src/models/CollectionEditResource.d.ts

@@ -1,8 +1,8 @@
 import { LocalCache } from '../classes';
 import { CollectionResourceFactory } from '../factories';
-import { CollectionEntry, CollectionResource, CollectionResourceOptions, ItemResource, ViewResource } from '../models';
+import { CollectionEntry, CollectionResource, CollectionResourceOptions, EditResource, ViewResource } from '../models';
 import { FieldMap, ItemId, ItemIdConversionMap, PromiseInterface } from '../types';
-export declare class CollectionEditResource<T extends ItemResource = ViewResource> extends CollectionResource<T> {
+export declare class CollectionEditResource<T extends ViewResource | EditResource = ViewResource> extends CollectionResource<T> {
     private factory;
     constructor(factory: CollectionResourceFactory, collectionEntry: CollectionEntry, options: CollectionResourceOptions, localCache: LocalCache);
     save(): PromiseInterface<ItemIdConversionMap>;

package/dist/src/models/CollectionResource.d.ts

@@ -1,9 +1,9 @@
 import { LocalCache } from '../classes';
 import { ItemResourceFactory } from '../factories';
-import { CollectionResourceOptions, ItemEntry, ItemResource, ViewResource } from '../models';
+import { CollectionResourceOptions, EditResource, ItemEntry, ViewResource } from '../models';
 import { ItemResourceItemIdMap, PromiseInterface, QueryCallback, ResponseColumnMap } from '../types';
 import { CollectionEntry } from './CollectionEntry';
-export declare abstract class CollectionResource<T extends ItemResource = ViewResource> {
+export declare class CollectionResource<T extends ViewResource | EditResource = ViewResource> {
     private itemResourceFactory;
     entry: CollectionEntry;
     options: CollectionResourceOptions;

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

@@ -1,6 +1,6 @@
 import { ItemEntry, ItemResourceOptions } from '../models';
 import { FieldMap, ResponseColumn } from '../types';
-export declare abstract class ItemResource {
+export declare class ItemResource {
     entry: ItemEntry;
     options: ItemResourceOptions;
     protected readonly _isNew: boolean;

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

@@ -1,6 +1,6 @@
 import { ApiResponseProcessor, CollectionMatcher, ColumnSet, LocalCache, RequestColumnExpansion } from '../classes';
 import { ENTRY_STATUS } from '../constants';
-import { CollectionEntry, CollectionEntryOptions, CollectionEntryOptionsInterface, CollectionResource, CollectionResourceOptions, CollectionResourceOptionsInterface, CollectionViewResource, ItemEntry, ItemEntryOptionsInterface, ItemResource, ItemResourceOptionsInterface, ViewResource } from '../models';
+import { CollectionEntry, CollectionEntryOptions, CollectionEntryOptionsInterface, CollectionResource, CollectionResourceOptions, CollectionResourceOptionsInterface, EditResource, ItemEntry, ItemEntryOptionsInterface, ItemResource, ItemResourceOptionsInterface, ViewResource } from '../models';
 export declare type EntryParent = {
     itemType: string;
     itemId: number;
@@ -85,10 +85,10 @@ export interface FunctionChangesResolveSocketMessage extends SocketMessage {
         [key: string]: any;
     };
 }
-export declare type ItemResourceItemIdMap<T extends ItemResource = ViewResource> = {
+export declare type ItemResourceItemIdMap<T extends ViewResource | EditResource = ViewResource> = {
     [itemId: number]: T;
 };
-export declare type ItemResourcesItemTypeMap<T extends ItemResource = ViewResource> = {
+export declare type ItemResourcesItemTypeMap<T extends ViewResource | EditResource = ViewResource> = {
     [itemType: string]: T[];
 };
 export declare type ItemId = number;
@@ -129,8 +129,8 @@ export declare type QueryCallback = (queryParams: QueryParams) => QueryParams;
 export declare type CollectionEntryParentIdMap = {
     [parentId: number]: CollectionEntry;
 };
-export declare type CollectionResourceParentIdMap<T extends CollectionResource = CollectionViewResource> = {
-    [parentId: number]: T;
+export declare type CollectionResourceParentIdMap = {
+    [parentId: number]: CollectionResource;
 };
 export declare type CollectionMatchResult = {
     fitting: CollectionEntry[];
@@ -138,7 +138,7 @@ export declare type CollectionMatchResult = {
     maybe: CollectionEntry[];
 };
 export interface ExtendedCollectionMatchResult extends CollectionMatchResult {
-    collection: CollectionEntry;
+    collection: CollectionResource;
 }
 export interface GroupedExtendedCollectionMatchResult {
     [collectionId: number]: ExtendedCollectionMatchResult;
@@ -167,8 +167,8 @@ export declare type RootColumnMap = {
     };
 };
 export declare type ApiResponse = ApiResponseProcessor;
-export declare type TemplateItemResourceMap<T extends ItemResource> = {
-    main: T;
+export declare type TemplateItemResourceMap = {
+    main: ItemResource;
     linked: ItemResourcesItemTypeMap;
 };
 export declare type TemplateItemEntryMap = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rentman/rm-core",
-  "version": "1.5.7-1",
+  "version": "1.5.7",
   "description": "Rentman core functionalities",
   "main": "./dist/rm-core.js",
   "types": "./dist/src/index.d.ts",