@rentman/rm-core 1.5.1 → 1.5.2

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

@@ -4,7 +4,7 @@ import { ENTRY_STATUS } from '../constants';
 import { BatchStatusFactory, CollectionCacheFactory, CollectionEntryFactory, CollectionMatcherFactory, ColumnSetFactory, QueryParserFactory } from '../factories';
 import { ErrorHandlerInterface, PromiseLibraryInterface } from '../interfaces';
 import { CollectionEntry, CollectionResource, ItemResource } from '../models';
-import { ApiRequestColumn, CollectionEntryParentIdMap, EntryStatus, ItemEntryParentIdMap, ItemId, ItemResourceItemIdMap, ItemType } from '../types';
+import { ApiRequestColumn, CollectionEntryParentIdMap, CollectionResourceParentIdMap, EntryStatus, ItemEntryParentIdMap, ItemId, ItemResourceItemIdMap, ItemType, QueryCallback } from '../types';
 export declare class CollectionHandler {
     private batchStatusFactory;
     private collectionCacheFactory;
@@ -35,8 +35,8 @@ export declare class CollectionHandler {
      * @deprecated, use collectionMatcherFactory
      */
     addToCollections(collectionMap: any, updateInitial: boolean, resultResource?: CollectionResource | null): ItemResource[];
-    batchExpand(parentType: ItemType, itemType: ItemType, collections: CollectionResource[], newColumns: ApiRequestColumn[]): PromiseInterface<CollectionResource[]>;
-    batchExtend(parentType: ItemType, itemType: ItemType, options: any, queryCallback: any, collections: CollectionResource[], returnAllItems?: boolean): PromiseInterface<ItemResourceItemIdMap>;
+    batchExpand(parentType: ItemType, itemType: ItemType, collections: CollectionResourceParentIdMap, newColumns: ApiRequestColumn[]): PromiseInterface<CollectionResourceParentIdMap>;
+    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): Promise<CollectionEntryParentIdMap>;
     handleBatchResponse(batchStatus: BatchStatus<CollectionEntry>, itemEntryCompound: {
         columns: ColumnSet;

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

@@ -1,8 +1,7 @@
-import { ColumnInfo, ColumnSet, ColumnUtil } from '../classes';
+import { ColumnInfo, ColumnSet } from '../classes';
 import { ApiRequestColumn, ApiRequestColumns, ColumnExpansionResult, ItemType, ResponseColumnMap } from '../types';
 export declare class ColumnExpansion {
     private columnInfoFactory;
-    private columnUtil;
     itemType: ItemType;
     responseColumns: ResponseColumnMap;
     expansionMap: {
@@ -11,7 +10,7 @@ export declare class ColumnExpansion {
     expansionMapSize: number;
     requestColumnsTrue: boolean;
     requestColumns: ApiRequestColumn[];
-    constructor(columnInfoFactory: any, columnUtil: ColumnUtil, itemType: ItemType, requestColumns: ApiRequestColumns, responseColumns: ResponseColumnMap);
+    constructor(columnInfoFactory: any, itemType: ItemType, requestColumns: ApiRequestColumns, responseColumns: ResponseColumnMap);
     run(columnSet: ColumnSet): ColumnExpansionResult | null;
     aggregateRootColumns(): ColumnInfo[];
     private expandRootColumnMap;

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

@@ -1,12 +1,12 @@
 import { ColumnHandler, ColumnInfo, ColumnUtil } from '../classes';
 import { ColumnInfoFactory, ColumnSetFactory } from '../factories';
-import { ApiRequestColumns, ColumnExpansionResult, ResponseColumnMap } from '../types';
+import { ApiRequestColumns, ColumnExpansionResult, ItemType, ResponseColumnMap } from '../types';
 export declare class ColumnSet {
     private columnHandler;
     private columnUtil;
     private columnInfoFactory;
     private columnSetFactory;
-    itemType: any;
+    itemType: ItemType;
     request: ApiRequestColumns;
     id: number;
     requestColumnsTrue: boolean;
@@ -26,14 +26,14 @@ export declare class ColumnSet {
     item: ColumnInfo[];
     notItem: ColumnInfo[];
     enableCaching: boolean;
-    constructor(columnHandler: ColumnHandler, columnUtil: ColumnUtil, columnInfoFactory: ColumnInfoFactory, columnSetFactory: ColumnSetFactory, itemType: any, request: ApiRequestColumns);
+    constructor(columnHandler: ColumnHandler, columnUtil: ColumnUtil, columnInfoFactory: ColumnInfoFactory, columnSetFactory: ColumnSetFactory, itemType: ItemType, request: ApiRequestColumns);
     toJSON(): {
         main: string[];
         derived: string[];
     };
     resolve(responseColumns: ResponseColumnMap, enableCaching?: boolean, includeIdColumn?: boolean): this;
     expandRequestColumns(columns: ApiRequestColumns): void;
-    isSupersetOf(columns: ApiRequestColumns): any;
+    isSupersetOf(columns: ApiRequestColumns): boolean;
     private processResponseColumns;
     private requestColumnsIsTrue;
     private processRequestColumns;

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

@@ -1,9 +1,8 @@
-import { ColumnSet, ColumnUtil } from '../classes';
+import { ColumnSet } from '../classes';
 import { ApiRequestColumns } from '../types';
 export declare class ColumnSubsetCache {
-    private columnUtil;
     requestColumns: ApiRequestColumns;
     private cache;
-    constructor(columnUtil: ColumnUtil, requestColumns: ApiRequestColumns);
+    constructor(requestColumns: ApiRequestColumns);
     run(columnSet: ColumnSet): boolean;
 }

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

@@ -1,4 +1,4 @@
-import { ApiRequestColumn, ApiRequestColumns, ResponseColumnMap } from '../types';
+import { ApiRequestColumn, ApiRequestColumns, ItemType, ResponseColumnMap } from '../types';
 export declare class ColumnUtil {
     constructor();
     getColumnPath(columns: any, renderAs: any): string;
@@ -28,10 +28,11 @@ export declare class ColumnUtil {
     isSearchableColumn(column: any): boolean;
     getDefaultWeight(column: any): 1 | 0.5 | 1.5 | 2;
     getComparators(column: any): string[];
-    isColumnSubset(first: any, second: any, secondTrue: any): any;
-    containsColumn(requestColumn: any, destination: any): boolean;
-    responseColumnsAvailable(itemType: any, requestColumns: any, responseColumnMap: any): boolean;
-    copyRequestColumns(columns: ApiRequestColumns): ApiRequestColumns;
+    containsColumn(requestColumn: ApiRequestColumn, destination: ApiRequestColumn[]): boolean;
+    containsDerivedColumns(requestColumns: ApiRequestColumn[]): boolean;
+    responseColumnsAvailable(itemType: ItemType, requestColumns: ApiRequestColumn[], responseColumnMap: ResponseColumnMap): boolean;
+    copyRequestColumns(columns: true): true;
+    copyRequestColumns(columns: ApiRequestColumn[]): ApiRequestColumn[];
     copyRequestColumn(requestColumn: ApiRequestColumn): ApiRequestColumn;
     /**
      * Difference: columns that are in second, but not in first
@@ -39,12 +40,19 @@ export declare class ColumnUtil {
      * @param {Array} second
      * @returns {Object} An object containing 'merged' and 'difference' properties
      */
+    mergeRequestColumns(first: ApiRequestColumn[], second: ApiRequestColumn[]): {
+        merged: ApiRequestColumn[];
+        difference: ApiRequestColumn[];
+    };
     mergeRequestColumns(first: ApiRequestColumns, second: ApiRequestColumns): {
         merged: ApiRequestColumns;
         difference: ApiRequestColumns;
     };
-    mergeRequestColumn(requestColumn: any, destination: any): any;
-    parseRequestColumn(requestColumn: any): {
+    mergeRequestColumn(requestColumn: ApiRequestColumn, destination: ApiRequestColumn[]): string | {
+        [columnId: string]: ApiRequestColumn[];
+    } | null;
+    getRequestColumnId(requestColumn: ApiRequestColumn): string;
+    parseRequestColumn(requestColumn: ApiRequestColumn): {
         id: string;
         children: ApiRequestColumn[];
     };
@@ -67,10 +75,9 @@ export declare class ColumnUtil {
         merged: {};
         difference: {};
     };
-    isLocalColumnId(columnId: any): boolean;
-    processConfigColumns(columns: any): never[];
-    parseConfigColumn(column: any): any;
-    processConfigColumn(columnArray: any, destination: any): void;
-    findColumnObject(columnId: any, array: any): number;
-    findColumn(columnId: any, array: any): number;
+    isLocalColumnId(columnId: string): boolean;
+    processConfigColumns(configColumns: string[]): ApiRequestColumn[];
+    parseConfigColumn(configColumn: string): string[];
+    processConfigColumn(parsedConfigColumn: string[], destination: ApiRequestColumn[]): void;
+    findRequestColumn(columnId: string, requestColumns: ApiRequestColumn[]): number;
 }

package/dist/src/factories/ColumnExpansionFactory.d.ts

@@ -1,9 +1,8 @@
-import { ColumnExpansion, ColumnUtil } from '../classes';
+import { ColumnExpansion } from '../classes';
 import { ColumnInfoFactory } from '../factories';
 import { ApiRequestColumns, ItemType, ResponseColumnMap } from '../types';
 export declare class ColumnExpansionFactory {
     private columnInfoFactory;
-    private columnUtil;
-    constructor(columnInfoFactory: ColumnInfoFactory, columnUtil: ColumnUtil);
+    constructor(columnInfoFactory: ColumnInfoFactory);
     construct(itemType: ItemType, requestColumns: ApiRequestColumns, responseColumns: ResponseColumnMap): ColumnExpansion;
 }

package/dist/src/factories/ColumnSubsetCacheFactory.d.ts

@@ -1,7 +1,6 @@
-import { ColumnSubsetCache, ColumnUtil } from '../classes';
+import { ColumnSubsetCache } from '../classes';
 import { ApiRequestColumns } from '../types';
 export declare class ColumnSubsetCacheFactory {
-    private columnUtil;
-    constructor(columnUtil: ColumnUtil);
+    constructor();
     construct(requestColumns: ApiRequestColumns): ColumnSubsetCache;
 }

package/package.json

@@ -1,35 +1,35 @@
-{
-  "name": "@rentman/rm-core",
-  "version": "1.5.1",
-  "description": "Rentman core functionalities",
-  "main": "./dist/rm-core.js",
-  "types": "./dist/src/index.d.ts",
-  "dependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rentmanpublic/frontend-core"
-  },
-  "devDependencies": {
-    "@types/moment": "^2.13.0",
-    "@types/q": "^1.5.0",
-    "clean-webpack-plugin": "^0.1.19",
-    "ts-loader": "^4.4.1",
-    "tslint": "^5.12.1",
-    "typescript": "3.2.2",
-    "uglifyjs-webpack-plugin": "^1.2.5",
-    "webpack": "^4.16.3",
-    "webpack-cli": "^3.0.6",
-    "webpack-merge": "^4.1.3"
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "prepublishOnly": "npm run bundle",
-    "bundle-dev": "webpack --config webpack.dev.js",
-    "bundle": "webpack --config webpack.prod.js",
-    "type-check": "tsc --noEmit"
-  },
-  "author": "Martijn Welker <martijn@rentman.nl>",
-  "license": "UNLICENSED"
-}
+{
+  "name": "@rentman/rm-core",
+  "version": "1.5.2",
+  "description": "Rentman core functionalities",
+  "main": "./dist/rm-core.js",
+  "types": "./dist/src/index.d.ts",
+  "dependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rentmanpublic/frontend-core"
+  },
+  "devDependencies": {
+    "@types/moment": "^2.13.0",
+    "@types/q": "^1.5.0",
+    "clean-webpack-plugin": "^0.1.19",
+    "ts-loader": "^4.4.1",
+    "tslint": "^5.12.1",
+    "typescript": "3.2.2",
+    "uglifyjs-webpack-plugin": "^1.2.5",
+    "webpack": "^4.16.3",
+    "webpack-cli": "^3.0.6",
+    "webpack-merge": "^4.1.3"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "prepublishOnly": "npm run bundle",
+    "bundle-dev": "webpack --config webpack.dev.js",
+    "bundle": "webpack --config webpack.prod.js",
+    "type-check": "tsc --noEmit"
+  },
+  "author": "Martijn Welker <martijn@rentman.nl>",
+  "license": "UNLICENSED"
+}