@rentman/rm-core 1.5.8 → 1.5.9

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

@@ -15,5 +15,4 @@ export declare class ColumnExpansion {
     run(columnSet: ColumnSet): ColumnExpansionResult | null;
     aggregateRootColumns(): ColumnInfo[];
     private expandRootColumnMap;
-    private processRootColumnMap;
 }

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

@@ -1,4 +1,4 @@
-import { ColumnHandler, ColumnInfo, ColumnUtil } from '../classes';
+import { ColumnHandler, ColumnInfo, ColumnUtil, RequestColumnMergeResult } from '../classes';
 import { ColumnInfoFactory, ColumnSetFactory } from '../factories';
 import { ApiRequestColumns, ColumnExpansionResult, ItemType, ResponseColumnMap } from '../types';
 export declare class ColumnSet {
@@ -25,7 +25,6 @@ export declare class ColumnSet {
     searchable: ColumnInfo[];
     item: ColumnInfo[];
     notItem: ColumnInfo[];
-    enableCaching: boolean;
     constructor(columnHandler: ColumnHandler, columnUtil: ColumnUtil, columnInfoFactory: ColumnInfoFactory, columnSetFactory: ColumnSetFactory, itemType: ItemType, request: ApiRequestColumns);
     toJSON(): {
         main: string[];
@@ -35,12 +34,13 @@ export declare class ColumnSet {
     expandRequestColumns(columns: ApiRequestColumns): void;
     isSupersetOf(columns: ApiRequestColumns): boolean;
     private processResponseColumns;
-    private requestColumnsIsTrue;
     private processRequestColumns;
-    private getRequestColumnInfo;
-    private getColumnInfo;
-    private getColumnSetExpansion;
+    private processColumnInfo;
+    private createRootColumnMap;
+    private groupColumnInfo;
     private getMergedColumnSet;
+    mergeRequestColumns(requestColumns: ApiRequestColumns): RequestColumnMergeResult;
+    mergeResponseColumns(responseColumns: ResponseColumnMap): ResponseColumnMap;
     merge(columnSet: ColumnSet): ColumnSet;
     expand(requestColumns: ApiRequestColumns, requestColumnsTrue: boolean, responseColumns: ResponseColumnMap): ColumnExpansionResult;
 }

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

@@ -1,4 +1,8 @@
 import { ApiRequestColumn, ApiRequestColumns, ItemType, ResponseColumn, ResponseColumnMap } from '../types';
+export declare type RequestColumnMergeResult<T extends ApiRequestColumns = ApiRequestColumns, U extends ApiRequestColumns = ApiRequestColumns> = {
+    merged: T;
+    difference: U;
+};
 export declare class ColumnUtil {
     constructor();
     getColumnPath(columns: ResponseColumn[], renderAs: null | string): string;
@@ -46,22 +50,10 @@ export declare class ColumnUtil {
      * @param {Array} second
      * @returns {Object} An object containing 'merged' and 'difference' properties
      */
-    mergeRequestColumns(first: true, second: ApiRequestColumns): {
-        merged: true;
-        difference: [];
-    };
-    mergeRequestColumns(first: ApiRequestColumn[], second: true): {
-        merged: true;
-        difference: true;
-    };
-    mergeRequestColumns(first: ApiRequestColumn[], second: ApiRequestColumn[]): {
-        merged: ApiRequestColumn[];
-        difference: ApiRequestColumn[];
-    };
-    mergeRequestColumns(first: ApiRequestColumns, second: ApiRequestColumns): {
-        merged: ApiRequestColumns;
-        difference: ApiRequestColumns;
-    };
+    mergeRequestColumns(first: true, second: ApiRequestColumns): RequestColumnMergeResult<true, []>;
+    mergeRequestColumns(first: ApiRequestColumn[], second: true): RequestColumnMergeResult<true, true>;
+    mergeRequestColumns(first: ApiRequestColumn[], second: ApiRequestColumn[]): RequestColumnMergeResult<ApiRequestColumn[], ApiRequestColumn[]>;
+    mergeRequestColumns(first: ApiRequestColumns, second: ApiRequestColumns): RequestColumnMergeResult;
     mergeRequestColumn(requestColumn: ApiRequestColumn, destination: ApiRequestColumn[]): string | {
         [columnId: string]: ApiRequestColumn[];
     } | null;

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

@@ -1,6 +1,7 @@
 import { ColumnInfo } from '../classes';
-import { ResponseColumn } from '../types';
+import { ResponseColumn, RootColumnMap } from '../types';
 export declare class ColumnInfoFactory {
     constructor();
     construct(apiColumn: ResponseColumn, parent: ColumnInfo | null): ColumnInfo;
+    constructFromRootMap(rootColumnMap: RootColumnMap, parent?: ColumnInfo | null): ColumnInfo[];
 }

package/dist/src/interfaces/PromiseLibraryInterface.d.ts

@@ -17,7 +17,7 @@ export interface PromiseLibraryInterface {
     all<TAll>(promises: Array<TAll | PromiseInterface<TAll>>): PromiseInterface<TAll[]>;
     all(iterable: Array<PromiseInterface<any> | any>): PromiseInterface<any[]>;
     all<T>(promises: {
-        [K in keyof T]: (PromiseInterface<T[K]> | T[K]);
+        [K in keyof T]: (PromiseInterface<T[K]> | T[K] | null);
     }): PromiseInterface<T>;
     when<T>(value?: PromiseInterface<T> | T): PromiseInterface<T>;
     reject(value?: any): PromiseInterface<any>;

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

@@ -153,13 +153,6 @@ export declare type ColumnExpansionResult = {
     merged: ColumnSet;
     difference: ColumnSet;
 };
-export declare type ColumnSetExpansion = {
-    request: {
-        merged: ApiRequestColumns;
-        difference: ApiRequestColumns;
-    };
-    response: ResponseColumnMap;
-};
 export declare type RootColumnMap = {
     [columnId: string]: {
         apiColumn: ResponseColumn;

package/package.json

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