@rentman/rm-core 1.1.6 → 1.1.8-1

package/changelog.md

@@ -1,161 +1,167 @@
-#Changelog
-Contains new features, breaking changes and their reasoning
-
-##v1.1.6
-- Fixed issue with deferred item entries.
-- Re-enable changes watcher after save.
-- Added optional `id` parameter to `LocalCache` constructor.
-
-##v1.1.5
-- Added `clearItem` function to `LocalCache` class.
-
-##v.1.1.4
-- Fix issue where items where not added to the local cache automatically when they where added to a collection.
-> This depends on the `callOnActivate` parameter. I've added this mainly because extending collections should *not* add
-the items to the local cache.
-> In other instances this might be debatable because it doesn't do any real harm. *Not*
-doing it however can definitely be harmful. 
-
-##v.1.1.3
-- Fixed an issue where all collections in a local cache would be cleared.
-- **Breaking:** Renamed `getCacheManager` to `getCurrentLocalCache` and `setCacheManager` to `setCurrentLocalCache` in
-`LocalCacheManagerInterface`.
-
-##v1.1.2
-- Fixed an issue concerning derived values.
-
-## v1.1.1
-- Fixed an issue where changes wouldn't be detected.
-- **Breaking:** Removed the `_hasChanges` function in the `localCache` class. If you want to force changes detection,
-call `detectChanges` instead. Otherwise, rely on the `hasChanges` variable.
-- **Breaking:** Removed the `enableWatcher` and `disableWatcher` functions. Use `enableChangesWatcher` and
-`disableChangesWatcher` instead.  
-
-## v1.1.0
-### Development
-
-#### Strict TypeScript compilation
-Added the following TypeScript compiler options:
-- noImplicitThis
-- noImplicitReturns
-- strictNullChecks
-- noUnusedLocals
-- noUnusedParameters
-
-I would advise enabling these for all TypeScript projects from now on.
-
-#### Ordered imports and dependencies
-Imports are now ordered alphabetically and grouped by folder. Added a TSLint option to enforce this.
-Please note that this also applies for imports from the folder the file is currently in.
-For example, in `models/ItemResource.ts`, `itemEntry` should be imported like so:
-`import { ItemEntry } from '../models';`
-
-Also, factory and class dependencies should be ordered alphabetically as well. This will make it easier to add and
-remove dependencies in the future.
-
-### Breaking changes
-
-- Renamed `changesCompiler` to `changesCompilation`, `changesCompilerFactory` to `changesCompilationFactory`,
-`moduleChangesCompiler` to `moduleChangesCompilation` and `moduleChangesCompilerFactory` to
-`moduleChangesCompilationFactory`.
-- Removed the `allLinks` parameter from the `query` function definition in the `ApiRequestServiceInterface`. This is
-no longer supported in the back-end.
-
-#### Item and collection entries
-- Moved *all* functions that handle item entries from the `ItemEntryService` to the `ItemEntry` class.
-- Added the following functions to `ItemEntryService`:
-	- `createLocalConversionMap`;
-	- `expandLocalConversionMap`;
-	- `expandConversionMap`;
-	- `batchExpandConversionMap`;
-	- `batchClone`.
-- Cloning of item entries now works slightly differently. The function will attempt to generate a new
-item ID, and update the conversion map accordingly, but will respect the item ID that is already there.
-
-#### Rework item caching
-Newly created item entries and collection entries are no longer added to the global *or* local cache by default. 
-All entries are added to the global cache on save. Item entries are added to the local cache when resources are created 
-using the item administrator or when resources are created when adding the items to a collection.
-
-> This will increase reliability by ensuring the global cache is no longer 'polluted' with local items. Also, this will
-> allow for the creation item and collection entries without caching them directly. This is required for the copying and
-> pasting of items.
- 
-Other changes: 
- 
-- Moved `saveLocal` to `ItemAdministrator`;
-- `ItemAdministrator.fetchTitle` should now be called instead of `ItemHandler.fetchTitle`;
-- The `ItemAdministrator` collection matching functions (`addToCollections`, `removeFromCollections`) should now be
-called instead of those in the `CollectionHandler`. The `CollectionHandler` should only be used to reflect changes
-already on the backend. (Use `getCollectionMatcher`.)
-
-
-##v1.0.33
-- Really fix types path
-
-##v1.0.33
-- Fix types path
-
-##v1.0.32
-- Update `tsconfig.json` to put definitions in the root folder
-> The app had an issue with AOT compilation because of this
-
-##v1.0.31
-- Fix `columnHandler.fetchItemTypeTranslations`
-> It incorrectly looped over the response map, it should now work again
-
-##v1.0.30
-- Remove `updateTabParams` from LocalCacheManagerInterface
-> The function wasn't used
-
-- Reworked class export
-> Imports are now done from @rentman/rm-core, old imports are broken. This is because the old export structure didn't always work
-
-##v1.0.29
-- Fix inverted inArray check in CollectionEntry.removeItems
-> A delete message from the socket deleted all BUT the deleted items, this should now be fixed
-
-##v1.0.28
-Bug fixes only
-
-##v1.0.27
-- `ItemEntry.initial` is now undefined by default
-> In the SocketMessageHandler we use this check to see if an ItemEntry is a stub 
-
-##v1.0.26
-Bundle both minified and unminified code, include sourcemaps from dev build
-
-##v1.0.24, v1.0.25
-! Use version `v1.0.26` !
-
-- The core now expects a `promiseInterface` that should implement the provided `promiseInterface`
-> We need to be able to hook into the promises in order to call a digest cycle to update the ui in the frontend
-
-- Rename `ItemEntry.entryId` to `ItemEntry.id
-> It used to be called `id`, but it was changed in the seperation of the core.
-> You can use the `id` to uniquely identify an entry, since itemId can be updated (local to saved id)
-
-- Rename ItemResource `startTransaction` to `start`
-> Other functions are called `commit` and `rollback` so having 'transaction' only for start doesn't make much sense
-
-- `SocketMessageHandler.onMessageReceived` now returns a promise
-> You can now use the updated items or hook into the result to update the ui for example
-
-
-##v1.0.23
-- Rename ResourceCache to LocalCache
-> LocalCache only caches local items (name better reflects functionality)
-
-- Remove getter/setter for hasChanges
-> hasChanges is called in a digest loop in the frontend, so for performance reasons we don't want to recompute the value every time
- 
-- Remove `_getCollection` from ItemAdministrator
-> `_getCollection` is now named `getCollection` and the old `getCollection` is removed. The query is part of the
-> options and should not be given as a separate argument. This was included to support the frontend
-
-- Remove `saveCurrentTab` from ItemAdministrator
-> `saveCurrentTab` makes no sense because the core has no concept of tabs, you should use `saveCurrentLocalCache` instead
-
-- Remove `getTabEntry` and `resetTabEntry` from ItemAdministrator
-> `getTabEntry` and `resetTabEntry` make no sense because the core has no concept of tabs, you should use `getLocalCache` and `resetLocalCache` instead
-
+#Changelog
+Contains new features, breaking changes and their reasoning
+
+##v1.1.8
+- Set default value for `params` to `{filter: false}` in `request` function in `ColumnHandler` class.
+
+##v1.1.7
+- Fixed issue where cached item entries or collection entries wouldn't be added to the local cache.
+
+##v1.1.6
+- Fixed issue with deferred item entries.
+- Re-enable changes watcher after save.
+- Added optional `id` parameter to `LocalCache` constructor.
+
+##v1.1.5
+- Added `clearItem` function to `LocalCache` class.
+
+##v.1.1.4
+- Fix issue where items where not added to the local cache automatically when they where added to a collection.
+> This depends on the `callOnActivate` parameter. I've added this mainly because extending collections should *not* add
+the items to the local cache.
+> In other instances this might be debatable because it doesn't do any real harm. *Not*
+doing it however can definitely be harmful. 
+
+##v.1.1.3
+- Fixed an issue where all collections in a local cache would be cleared.
+- **Breaking:** Renamed `getCacheManager` to `getCurrentLocalCache` and `setCacheManager` to `setCurrentLocalCache` in
+`LocalCacheManagerInterface`.
+
+##v1.1.2
+- Fixed an issue concerning derived values.
+
+## v1.1.1
+- Fixed an issue where changes wouldn't be detected.
+- **Breaking:** Removed the `_hasChanges` function in the `localCache` class. If you want to force changes detection,
+call `detectChanges` instead. Otherwise, rely on the `hasChanges` variable.
+- **Breaking:** Removed the `enableWatcher` and `disableWatcher` functions. Use `enableChangesWatcher` and
+`disableChangesWatcher` instead.  
+
+## v1.1.0
+### Development
+
+#### Strict TypeScript compilation
+Added the following TypeScript compiler options:
+- noImplicitThis
+- noImplicitReturns
+- strictNullChecks
+- noUnusedLocals
+- noUnusedParameters
+
+I would advise enabling these for all TypeScript projects from now on.
+
+#### Ordered imports and dependencies
+Imports are now ordered alphabetically and grouped by folder. Added a TSLint option to enforce this.
+Please note that this also applies for imports from the folder the file is currently in.
+For example, in `models/ItemResource.ts`, `itemEntry` should be imported like so:
+`import { ItemEntry } from '../models';`
+
+Also, factory and class dependencies should be ordered alphabetically as well. This will make it easier to add and
+remove dependencies in the future.
+
+### Breaking changes
+
+- Renamed `changesCompiler` to `changesCompilation`, `changesCompilerFactory` to `changesCompilationFactory`,
+`moduleChangesCompiler` to `moduleChangesCompilation` and `moduleChangesCompilerFactory` to
+`moduleChangesCompilationFactory`.
+- Removed the `allLinks` parameter from the `query` function definition in the `ApiRequestServiceInterface`. This is
+no longer supported in the back-end.
+
+#### Item and collection entries
+- Moved *all* functions that handle item entries from the `ItemEntryService` to the `ItemEntry` class.
+- Added the following functions to `ItemEntryService`:
+	- `createLocalConversionMap`;
+	- `expandLocalConversionMap`;
+	- `expandConversionMap`;
+	- `batchExpandConversionMap`;
+	- `batchClone`.
+- Cloning of item entries now works slightly differently. The function will attempt to generate a new
+item ID, and update the conversion map accordingly, but will respect the item ID that is already there.
+
+#### Rework item caching
+Newly created item entries and collection entries are no longer added to the global *or* local cache by default. 
+All entries are added to the global cache on save. Item entries are added to the local cache when resources are created 
+using the item administrator or when resources are created when adding the items to a collection.
+
+> This will increase reliability by ensuring the global cache is no longer 'polluted' with local items. Also, this will
+> allow for the creation item and collection entries without caching them directly. This is required for the copying and
+> pasting of items.
+ 
+Other changes: 
+ 
+- Moved `saveLocal` to `ItemAdministrator`;
+- `ItemAdministrator.fetchTitle` should now be called instead of `ItemHandler.fetchTitle`;
+- The `ItemAdministrator` collection matching functions (`addToCollections`, `removeFromCollections`) should now be
+called instead of those in the `CollectionHandler`. The `CollectionHandler` should only be used to reflect changes
+already on the backend. (Use `getCollectionMatcher`.)
+
+
+##v1.0.33
+- Really fix types path
+
+##v1.0.33
+- Fix types path
+
+##v1.0.32
+- Update `tsconfig.json` to put definitions in the root folder
+> The app had an issue with AOT compilation because of this
+
+##v1.0.31
+- Fix `columnHandler.fetchItemTypeTranslations`
+> It incorrectly looped over the response map, it should now work again
+
+##v1.0.30
+- Remove `updateTabParams` from LocalCacheManagerInterface
+> The function wasn't used
+
+- Reworked class export
+> Imports are now done from @rentman/rm-core, old imports are broken. This is because the old export structure didn't always work
+
+##v1.0.29
+- Fix inverted inArray check in CollectionEntry.removeItems
+> A delete message from the socket deleted all BUT the deleted items, this should now be fixed
+
+##v1.0.28
+Bug fixes only
+
+##v1.0.27
+- `ItemEntry.initial` is now undefined by default
+> In the SocketMessageHandler we use this check to see if an ItemEntry is a stub 
+
+##v1.0.26
+Bundle both minified and unminified code, include sourcemaps from dev build
+
+##v1.0.24, v1.0.25
+! Use version `v1.0.26` !
+
+- The core now expects a `promiseInterface` that should implement the provided `promiseInterface`
+> We need to be able to hook into the promises in order to call a digest cycle to update the ui in the frontend
+
+- Rename `ItemEntry.entryId` to `ItemEntry.id
+> It used to be called `id`, but it was changed in the seperation of the core.
+> You can use the `id` to uniquely identify an entry, since itemId can be updated (local to saved id)
+
+- Rename ItemResource `startTransaction` to `start`
+> Other functions are called `commit` and `rollback` so having 'transaction' only for start doesn't make much sense
+
+- `SocketMessageHandler.onMessageReceived` now returns a promise
+> You can now use the updated items or hook into the result to update the ui for example
+
+
+##v1.0.23
+- Rename ResourceCache to LocalCache
+> LocalCache only caches local items (name better reflects functionality)
+
+- Remove getter/setter for hasChanges
+> hasChanges is called in a digest loop in the frontend, so for performance reasons we don't want to recompute the value every time
+ 
+- Remove `_getCollection` from ItemAdministrator
+> `_getCollection` is now named `getCollection` and the old `getCollection` is removed. The query is part of the
+> options and should not be given as a separate argument. This was included to support the frontend
+
+- Remove `saveCurrentTab` from ItemAdministrator
+> `saveCurrentTab` makes no sense because the core has no concept of tabs, you should use `saveCurrentLocalCache` instead
+
+- Remove `getTabEntry` and `resetTabEntry` from ItemAdministrator
+> `getTabEntry` and `resetTabEntry` make no sense because the core has no concept of tabs, you should use `getLocalCache` and `resetLocalCache` instead
+

package/dist/dist/classes/ApiFormatter.d.ts

@@ -27,7 +27,7 @@ export declare class ApiFormatter {
     formatRequestDate(value: any): any;
     formatRequestDuration(value: any): any;
     formatRequestColor(value: any): any;
-    getDefaultValue(columnType: any): false | "" | 0 | moment.Moment | moment.Duration | "0" | "#000000" | null;
+    getDefaultValue(columnType: any): false | moment.Moment | 0 | moment.Duration | "" | "0" | "#000000" | null;
     isDefaultValue(columnType: any, value: any): any;
     clone(columnType: any, value: any): any;
     getCloneFunction(columnType: any): (date: any) => any;

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

@@ -1,24 +1,24 @@
-import { CollectionCache, CollectionEntryService, CollectionMatcher, ColumnHandler, ColumnUtil, ItemCache, ItemRequestService, KeyService, QueryService } from '../classes';
+import { CollectionCache, CollectionEntryService, CollectionMatcher, ColumnExpansion, ColumnHandler, ColumnSet, ItemCache, ItemRequestService, KeyService, QueryService } from '../classes';
+import { ENTRY_STATUS } from '../constants';
 import { CollectionCacheFactory, CollectionEntryFactory, CollectionMatcherFactory, ColumnSetFactory, QueryParserFactory } from '../factories';
 import { ErrorHandlerInterface, PromiseInterface } from '../interfaces';
 import { CollectionEntry, CollectionResource, ItemResource } from '../models';
-import { CollectionEntryBatchStatusMap, CollectionEntryParentIdMap, EntryStatus, ItemResourceItemIdMap } from '../types';
+import { CollectionEntryBatchStatusMap, CollectionEntryParentIdMap, EntryStatus, ItemEntryParentIdMap, ItemId, ItemResourceItemIdMap, ItemType } from '../types';
 export declare class CollectionHandler {
     private errorHandler;
     private itemRequestService;
     private columnHandler;
+    private columnSetFactory;
     private collectionEntryFactory;
     private collectionCacheFactory;
     private queryParserFactory;
     private collectionEntryService;
-    private columnSetFactory;
     private keyService;
     private promiseService;
     private queryService;
-    private columnUtil;
     private collectionMatcherFactory;
     entries: CollectionCache;
-    constructor(errorHandler: ErrorHandlerInterface, itemRequestService: ItemRequestService, columnHandler: ColumnHandler, collectionEntryFactory: CollectionEntryFactory, collectionCacheFactory: CollectionCacheFactory, queryParserFactory: QueryParserFactory, collectionEntryService: CollectionEntryService, columnSetFactory: ColumnSetFactory, keyService: KeyService, promiseService: PromiseInterface, queryService: QueryService, columnUtil: ColumnUtil, collectionMatcherFactory: CollectionMatcherFactory);
+    constructor(errorHandler: ErrorHandlerInterface, itemRequestService: ItemRequestService, columnHandler: ColumnHandler, columnSetFactory: ColumnSetFactory, collectionEntryFactory: CollectionEntryFactory, collectionCacheFactory: CollectionCacheFactory, queryParserFactory: QueryParserFactory, collectionEntryService: CollectionEntryService, keyService: KeyService, promiseService: PromiseInterface, queryService: QueryService, collectionMatcherFactory: CollectionMatcherFactory);
     getPromises(statusResource: CollectionEntryBatchStatusMap): CollectionEntry[];
     getRequestIds(statusResource: any): number[];
     /**
@@ -36,14 +36,21 @@ export declare class CollectionHandler {
     addToCollections(collectionMap: any, updateInitial: boolean, resultResource?: CollectionResource | null): ItemResource[];
     batchExpand(parentType: string, itemType: string, collections: CollectionResource[], newColumns: any): Promise<CollectionResource[]>;
     batchExtend(parentType: string, itemType: string, options: any, queryCallback: any, collections: CollectionResource[], returnAllItems?: boolean): Promise<ItemResourceItemIdMap>;
-    batchFetch(parentType: string, parentIdArray: number[], itemType: string, options: any, itemCache: ItemCache, localCollectionCache: CollectionCache, deferredCollectionCache: CollectionCache): Promise<CollectionEntryParentIdMap>;
-    createStatusResource(parentType: string, parentIdArray: number[], itemType: string, options: any, localCollectionCache: CollectionCache, deferredCollectionCache: CollectionCache): CollectionEntryBatchStatusMap;
-    fetch(itemType: string, options: any, itemCache: ItemCache, localCollectionCache: CollectionCache, deferredCollectionCache: CollectionCache): Promise<CollectionEntry>;
-    getDeferredEntryStatus(collectionEntry: CollectionEntry, options: any): EntryStatus<CollectionEntry>;
-    getEntryStatus(itemType: string, options: any, localEntries: CollectionCache, deferredEntries: CollectionCache): EntryStatus<CollectionEntry>;
-    getNewEntryStatus(itemType: string, query: any, options: any, localEntries: CollectionCache, deferredEntries: CollectionCache): EntryStatus<CollectionEntry>;
-    handleBatchResponse(statusResource: any, itemEntryResource: any, itemCache: ItemCache): CollectionEntryParentIdMap;
-    resolveLocal(collectionEntry: CollectionEntry, itemCache: any): Promise<CollectionEntry>;
-    resolveRemote(collectionEntry: any, itemCache: any): Promise<CollectionEntry>;
+    batchFetch(parentType: ItemType, parentIdArray: ItemId[], itemType: ItemType, options: any, itemCache: ItemCache, localCollectionCache: CollectionCache, deferredCollectionCache: CollectionCache): Promise<CollectionEntryParentIdMap>;
+    createStatusResource(parentType: ItemType, parentIdArray: ItemId[], itemType: ItemType, options: any, localCollectionCache: CollectionCache, deferredCollectionCache: CollectionCache): CollectionEntryBatchStatusMap;
+    fetch(itemType: ItemType, options: any, itemCache: ItemCache, localCollectionCache: CollectionCache, deferredCollectionCache: CollectionCache): Promise<CollectionEntry>;
+    getCachedEntryStatus(collectionEntry: CollectionEntry, options: any): ENTRY_STATUS;
+    getDeferredEntryStatus(itemType: ItemType, options: any, query: any, deferredEntries: any): {
+        entry: CollectionEntry;
+        isDeferred: boolean;
+    };
+    getEntryStatus(itemType: ItemType, options: any, localEntries: CollectionCache, deferredEntries: CollectionCache): EntryStatus<CollectionEntry>;
+    handleBatchResponse(statusResource: any, itemEntryCompound: {
+        columns: ColumnSet;
+        columnExpansion?: ColumnExpansion;
+        items?: ItemEntryParentIdMap;
+    }, itemCache: ItemCache): CollectionEntryParentIdMap;
+    resolveLocal(collectionEntry: CollectionEntry, itemCache: ItemCache): Promise<CollectionEntry>;
+    resolveRemote(collectionEntry: CollectionEntry, itemCache: ItemCache): Promise<CollectionEntry>;
     isLocal(options: any): boolean;
 }

package/dist/dist/classes/CollectionMatcher.d.ts

@@ -18,7 +18,7 @@ export declare class CollectionMatcher {
         };
     };
     constructor(queryMatcherFactory: QueryMatcherFactory, collectionCaches: CollectionCache[], updateInitial: boolean, callOnActivate: boolean);
-    expand(itemEntry: ItemEntry): Window;
+    expand(itemEntry: ItemEntry): this;
     getCollectionsWithFittingItems(): CollectionEntry[];
     addToCollections(resultResource?: CollectionResource | null): ItemResource[] | null;
     removeFromCollections(resultResource?: CollectionResource | null): ItemResource[] | null;

package/dist/dist/classes/ColumnExpansion.d.ts

@@ -1,14 +1,17 @@
-import { ColumnUtil } from '../classes';
+import { ColumnSet, ColumnUtil } from '../classes';
 import { ColumnSetFactory } from '../factories';
+import { ColumnExpansionResult, ItemType, RequestColumns, ResponseColumnMap } from '../types';
 export declare class ColumnExpansion {
     private columnSetFactory;
     private columnUtil;
-    itemType: string;
-    requestColumns: any | boolean;
-    responseColumns: any;
-    expansionMap: any;
+    itemType: ItemType;
+    requestColumns: RequestColumns;
+    responseColumns: ResponseColumnMap;
+    expansionMap: {
+        [columnSetId: number]: ColumnExpansionResult;
+    };
     requestColumnsTrue: boolean;
-    constructor(columnSetFactory: ColumnSetFactory, columnUtil: ColumnUtil, itemType: string, requestColumns: any | boolean, responseColumns: any);
-    run(columnInfo: any, returnExpansionResult: boolean): any;
+    constructor(columnSetFactory: ColumnSetFactory, columnUtil: ColumnUtil, itemType: ItemType, requestColumns: RequestColumns, responseColumns: ResponseColumnMap);
+    run(columnSet: ColumnSet): ColumnExpansionResult | null;
     private expandColumnInfo(columnSet);
 }

package/dist/dist/classes/ColumnHandler.d.ts

@@ -10,7 +10,9 @@ export declare class ColumnHandler {
     setColumn(itemType: any, responseColumn: any): any;
     setColumns(itemType: any, requestColumns: any, responseColumns: any): {};
     fetchItemTypeTranslations(itemTypes: any): Promise<any>;
-    request(itemType: any, columns: any, params?: {}): Promise<any>;
-    fetch(itemType: any, requestColumns: any, params?: {}): Promise<any>;
+    request(itemType: any, columns: any, params?: {
+        filter: boolean;
+    }): Promise<any>;
+    fetch(itemType: any, requestColumns: any, params?: any): Promise<any>;
     fetchAll(itemType: any): Promise<any>;
 }

package/dist/dist/classes/ColumnSet.d.ts

@@ -27,6 +27,8 @@ export declare class ColumnSet {
     enableCaching: boolean;
     constructor(columnHandler: ColumnHandler, columnUtil: ColumnUtil, columnInfoFactory: ColumnInfoFactory, itemType: any, request: RequestColumns);
     resolve(responseColumns: ResponseColumnMap, enableCaching?: boolean, includeIdColumn?: boolean): this;
+    expandRequestColumns(columns: RequestColumns): void;
+    isSupersetOf(columns: RequestColumns): any;
     private processResponseColumns(responseColumns);
     private processRequestColumns(responseColumns, includeIdColumn);
     private getRequestColumnInfo(requestColumn, itemType, parent, responseColumns);

package/dist/dist/classes/ItemHandler.d.ts

@@ -1,9 +1,11 @@
-import { ApiResponseProcessor, BatchStatus, ColumnHandler, ColumnSet, ColumnUtil, ItemCache, ItemEntryService, KeyService } from '../classes';
+import { ApiResponseProcessor, BatchStatus, ColumnHandler, ColumnUtil, ItemCache, ItemEntryService, KeyService } from '../classes';
 import { ENTRY_STATUS } from '../constants';
 import { BatchStatusFactory, ColumnExpansionFactory, ColumnSetFactory, ItemCacheFactory, ItemEntryFactory } from '../factories';
 import { ApiRequestServiceInterface, ErrorHandlerInterface, PromiseInterface } from '../interfaces';
 import { ItemEntry } from '../models';
-import { ApiTemplateItemTypeMap, EntryStatus, ItemId, ItemIdConversionMap, ItemType, RequestColumns, TemplateResponseItemEntryMap, TemplateResponseLinkedItemEntryMap } from '../types';
+import { ApiResponse, ApiTemplateItemTypeMap, EntryStatus, ItemId, ItemIdConversionMap, ItemType, RequestColumns, TemplateResponseItemEntryMap, TemplateResponseLinkedItemEntryMap } from '../types';
+import { ColumnExpansion } from './ColumnExpansion';
+import { ColumnSet } from './ColumnSet';
 export declare class ItemHandler {
     private apiRequestService;
     private errorHandler;
@@ -34,12 +36,11 @@ export declare class ItemHandler {
     fetchItems(itemType: any, itemIds: any, options: any, localItemCache: ItemCache): Promise<ItemEntry[]>;
     resolveCached(itemEntry: ItemEntry, status: ENTRY_STATUS, options: any): Promise<ItemEntry>;
     resolveLocal(itemEntry: ItemEntry, parent: any, template: any, localItemCache: ItemCache): TemplateResponseItemEntryMap;
-    resolveExpansion(itemEntry: any, columnExpansion: any, response: any): ItemEntry;
-    resolveRemote(itemEntry: any, columnInfo: any, response: any): any;
+    resolveExpansion(itemEntry: ItemEntry, columnExpansion: ColumnExpansion, response: ApiResponse): ItemEntry;
+    resolveRemote(itemEntry: ItemEntry, columnSet: ColumnSet, response: ApiResponse): ItemEntry | null;
     fetchTemplate(itemType: string, templateOptions?: any, templateColumns?: any): Promise<any>;
     getEntryStatus(itemType: ItemType, itemId: ItemId, options: any, localItemCache: ItemCache): EntryStatus<ItemEntry>;
-    isColumnSubset(itemEntry: ItemEntry, columns: RequestColumns): any;
-    expandColumnSetStub(columnSet: ColumnSet, columns: RequestColumns): void;
+    isColumnSuperset(itemEntry: ItemEntry, columns: RequestColumns): any;
     getCachedEntryStatus(itemEntry: ItemEntry, options: any): ENTRY_STATUS;
     /**
      *

package/dist/dist/classes/ItemRequestService.d.ts

@@ -1,7 +1,8 @@
-import { ApiResponseProcessor, ColumnExpansion, ItemHandler, QueryService } from '../classes';
+import { ApiResponseProcessor, ColumnExpansion, ColumnSet, ItemHandler, QueryService } from '../classes';
 import { ColumnExpansionFactory, ColumnSetFactory, ItemEntryFactory } from '../factories';
 import { ApiRequestServiceInterface, ErrorHandlerInterface, PromiseInterface } from '../interfaces';
 import { CollectionEntry, ItemEntry } from '../models';
+import { ApiResponse, EntryParentNull, ItemId, ItemType } from '../types';
 export declare class ItemRequestService {
     private apiRequestService;
     private errorHandler;
@@ -16,7 +17,7 @@ export declare class ItemRequestService {
     requestItems(collectionEntry: CollectionEntry, query?: any, columns?: any): Promise<ApiResponseProcessor>;
     requestLinkItems(parentType: any, parentIdArray: any, itemType: any, query: any, columns: any): Promise<ApiResponseProcessor>;
     processExpansion(requestColumns: any, response: any, itemType: string, itemEntries: ItemEntry[]): ColumnExpansion;
-    processResponse(response: any, idArray: any, parent: any, columnInfo: any, columnExpansion?: any): Promise<ItemEntry[]>;
+    processResponse(response: ApiResponse, idArray: ItemId[], parent: EntryParentNull, columnSet: ColumnSet, columnExpansion?: ColumnExpansion): Promise<ItemEntry[]>;
     handleCachedItem(itemEntry: any, response: any, columnExpansion: ColumnExpansion): any;
-    processLinkResponse(response: any, parentType: any, parentIdArray: any, itemType: any, options: any): Promise<any>;
+    processLinkResponse(response: ApiResponse, parentType: ItemType, parentIdArray: ItemId[], itemType: ItemType, options: any): Promise<any>;
 }

package/dist/dist/factories/CollectionEntryFactory.d.ts

@@ -1,14 +1,16 @@
 import { CollectionEntryService, ItemEntryService, ItemRequestService, KeyService, QueryService } from '../classes';
+import { ColumnSetFactory } from '../factories';
 import { ErrorHandlerInterface, PromiseInterface } from '../interfaces';
 import { CollectionEntry } from '../models/';
 export declare class CollectionEntryFactory {
     private collectionEntryService;
+    private columnSetFactory;
     private errorHandler;
     private itemEntryService;
     private itemRequestService;
     private keyService;
     private promiseService;
     private queryService;
-    constructor(collectionEntryService: CollectionEntryService, errorHandler: ErrorHandlerInterface, itemEntryService: ItemEntryService, itemRequestService: ItemRequestService, keyService: KeyService, promiseService: PromiseInterface, queryService: QueryService);
+    constructor(collectionEntryService: CollectionEntryService, columnSetFactory: ColumnSetFactory, errorHandler: ErrorHandlerInterface, itemEntryService: ItemEntryService, itemRequestService: ItemRequestService, keyService: KeyService, promiseService: PromiseInterface, queryService: QueryService);
     construct(itemType: string, options: any): CollectionEntry;
 }

package/dist/dist/models/CollectionEntry.d.ts

@@ -1,11 +1,12 @@
-import { CollectionEntryService, ColumnInfo, ColumnSet, ItemEntryService, ItemRequestService, KeyService, QueryService } from '../classes';
-import { CollectionEntryFactory } from '../factories';
+import { CollectionEntryService, ColumnExpansion, ColumnInfo, ColumnSet, ItemEntryService, ItemRequestService, KeyService, QueryService } from '../classes';
+import { CollectionEntryFactory, ColumnSetFactory } from '../factories';
 import { ErrorHandlerInterface, PromiseInterface } from '../interfaces';
 import { CollectionResource, ItemEntry, ItemResource } from '../models';
-import { EntryParentNull, ItemId, ItemIdConversionMap, ItemType } from '../types';
+import { EntryParentNull, ItemId, ItemIdConversionMap, ItemType, RequestColumns } from '../types';
 export declare class CollectionEntry {
     private collectionEntryFactory;
     private collectionEntryService;
+    private columnSetFactory;
     private errorHandler;
     private itemEntryService;
     private itemRequestService;
@@ -24,9 +25,12 @@ export declare class CollectionEntry {
     deferred: any;
     promise: Promise<CollectionEntry>;
     reloadQueued: boolean;
-    constructor(collectionEntryFactory: CollectionEntryFactory, collectionEntryService: CollectionEntryService, errorHandler: ErrorHandlerInterface, itemEntryService: ItemEntryService, itemRequestService: ItemRequestService, keyService: KeyService, promiseService: PromiseInterface, queryService: QueryService, itemType: ItemType, options: any);
+    constructor(collectionEntryFactory: CollectionEntryFactory, collectionEntryService: CollectionEntryService, columnSetFactory: ColumnSetFactory, errorHandler: ErrorHandlerInterface, itemEntryService: ItemEntryService, itemRequestService: ItemRequestService, keyService: KeyService, promiseService: PromiseInterface, queryService: QueryService, itemType: ItemType, options: any);
     isDeferred(): boolean;
-    resolve(itemEntryCompound: any): CollectionEntry;
+    resolve(itemEntryCompound: {
+        columns: ColumnSet;
+        items: ItemEntry[];
+    }): CollectionEntry;
     isLocal(): boolean;
     matchParent(itemType: any, itemId: any): boolean;
     forEach(callback: (itemEntry: ItemEntry) => void): void;
@@ -40,7 +44,8 @@ export declare class CollectionEntry {
     extendQuery(callback: any): any;
     extend(queryCallback: any, collectionResource: any, callOnAdd?: any, updateInitial?: any): Promise<any>;
     queueReload(): void;
-    updateColumns(columnExpansion: any): void;
+    expandColumns(columnExpansion: ColumnExpansion): void;
+    expandRequestColumns(requestColumns: RequestColumns): void;
     getAddedItems(returnItemIds?: boolean): (number | ItemEntry)[];
     getRemovedItems(returnItemIds?: boolean): (number | ItemEntry)[];
     getUpdatedItems(): ItemEntry[];

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

@@ -1,4 +1,4 @@
-import { CollectionMatcher, RequestColumnExpansion } from '../classes';
+import { CollectionMatcher, ColumnSet, RequestColumnExpansion } from '../classes';
 import { ENTRY_STATUS } from '../constants';
 import { CollectionEntry, CollectionResource, ItemEntry, ItemResource } from '../models';
 export declare type EntryParent = {
@@ -20,6 +20,9 @@ export declare type ItemType = string;
 export declare type ItemEntryEntryStatusMap = {
     [entryStatus: string]: ItemEntry[];
 };
+export declare type ItemEntryParentIdMap = {
+    [parentId: number]: ItemEntry[];
+};
 export declare type ItemIdConversionMap = {
     [itemType: string]: {
         [itemId: number]: number;
@@ -50,6 +53,10 @@ export declare type ResponseColumnMap = {
     };
 };
 export declare type LocalColumn = object;
+export declare type ColumnExpansionResult = {
+    merged: ColumnSet;
+    difference: ColumnSet;
+};
 export declare type ApiResponse = any;
 export interface ApiTemplate {
     fields: any;