@milaboratories/pl-model-middle-layer 1.7.28 → 1.7.30

package/dist/pframe/internal_api/api_read.d.ts

@@ -1,10 +1,10 @@
 import { FindColumnsRequest, FindColumnsResponse } from './find_columns';
 import { DeleteColumnFromColumnsRequest, DeleteColumnFromColumnsResponse } from './delete_column';
 import { PColumnInfo, PColumnSpec, PObjectId, UniqueValuesRequest, UniqueValuesResponse } from '@milaboratories/pl-model-common';
-import { CreateTableRequestV2 } from './create_table';
-import { PTableV3, PTableV4 } from './table';
+import { CreateTableRequestV2, CreateTableRequestV3 } from './create_table';
+import { PTableV4 } from './table';
 /** Read interface exposed by PFrames library */
-export interface PFrameReadAPIV4 {
+export interface PFrameReadAPIV5 {
     /**
      * Finds columns given filtering criteria on column name, annotations etc.
      * and a set of qualified axes specs to find only columns with compatible
@@ -21,12 +21,12 @@ export interface PFrameReadAPIV4 {
     /** Retrieve information about all columns currently added to the PFrame */
     listColumns(): Promise<PColumnInfo[]>;
     /** Calculates data for the table and returns an object to access it */
-    createTable(request: CreateTableRequestV2, signal?: AbortSignal): Promise<PTableV3>;
+    createTable(request: CreateTableRequestV2, signal?: AbortSignal): Promise<PTableV4>;
     /** Calculate set of unique values for a specific axis for the filtered set of records */
     getUniqueValues(request: UniqueValuesRequest, signal?: AbortSignal): Promise<UniqueValuesResponse>;
 }
 /** Read interface exposed by PFrames library */
-export interface PFrameReadAPIV5 {
+export interface PFrameReadAPIV6 {
     /**
      * Finds columns given filtering criteria on column name, annotations etc.
      * and a set of qualified axes specs to find only columns with compatible
@@ -43,7 +43,7 @@ export interface PFrameReadAPIV5 {
     /** Retrieve information about all columns currently added to the PFrame */
     listColumns(): Promise<PColumnInfo[]>;
     /** Calculates data for the table and returns an object to access it */
-    createTable(request: CreateTableRequestV2, signal?: AbortSignal): Promise<PTableV4>;
+    createTable(request: CreateTableRequestV3, signal?: AbortSignal): Promise<PTableV4>;
     /** Calculate set of unique values for a specific axis for the filtered set of records */
     getUniqueValues(request: UniqueValuesRequest, signal?: AbortSignal): Promise<UniqueValuesResponse>;
 }

package/dist/pframe/internal_api/api_read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api_read.d.ts","sourceRoot":"","sources":["../../../src/pframe/internal_api/api_read.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,8BAA8B,EAAE,+BAA+B,EAAE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EACL,WAAW,EACX,WAAW,EACX,SAAS,EACT,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE7C,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC9B;;;;;;;SAOK;IACL,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEvE,mCAAmC;IACnC,YAAY,CAAC,OAAO,EAAE,8BAA8B,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAEhG,kCAAkC;IAClC,aAAa,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEzD,2EAA2E;IAC3E,WAAW,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAEtC,uEAAuE;IACvE,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEpF,yFAAyF;IACzF,eAAe,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACpG;AAED,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC9B;;;;;;;SAOK;IACL,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEvE,mCAAmC;IACnC,YAAY,CAAC,OAAO,EAAE,8BAA8B,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAEhG,kCAAkC;IAClC,aAAa,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEzD,2EAA2E;IAC3E,WAAW,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAEtC,uEAAuE;IACvE,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEpF,yFAAyF;IACzF,eAAe,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACpG"}
+{"version":3,"file":"api_read.d.ts","sourceRoot":"","sources":["../../../src/pframe/internal_api/api_read.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,8BAA8B,EAAE,+BAA+B,EAAE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EACL,WAAW,EACX,WAAW,EACX,SAAS,EACT,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC9B;;;;;;;SAOK;IACL,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEvE,mCAAmC;IACnC,YAAY,CAAC,OAAO,EAAE,8BAA8B,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAEhG,kCAAkC;IAClC,aAAa,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEzD,2EAA2E;IAC3E,WAAW,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAEtC,uEAAuE;IACvE,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEpF,yFAAyF;IACzF,eAAe,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACpG;AAED,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC9B;;;;;;;SAOK;IACL,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEvE,mCAAmC;IACnC,YAAY,CAAC,OAAO,EAAE,8BAA8B,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAEhG,kCAAkC;IAClC,aAAa,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEzD,2EAA2E;IAC3E,WAAW,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAEtC,uEAAuE;IACvE,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEpF,yFAAyF;IACzF,eAAe,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACpG"}

package/dist/pframe/internal_api/create_table.d.ts

@@ -1,5 +1,9 @@
 import { ConstantAxisFilter } from './common';
-import { PObjectId, PTableRecordFilter } from '@milaboratories/pl-model-common';
+import { JsonDataInfo, PColumnSpec, PObjectId, PTableRecordFilter } from '@milaboratories/pl-model-common';
+export interface ColumnJoinEntry {
+    type: 'column';
+    columnId: PObjectId;
+}
 export interface ColumnJoinEntryV2 {
     type: 'column';
     columnId: PObjectId;
@@ -10,6 +14,25 @@ export interface SlicedColumnJoinEntry {
     readonly newId: PObjectId;
     readonly axisFilters: ConstantAxisFilter[];
 }
+export interface InlineColumnJoinEntry {
+    readonly type: 'inlineColumn';
+    readonly newId: PObjectId;
+    readonly spec: PColumnSpec;
+    readonly dataInfo: JsonDataInfo;
+}
+export interface InnerJoinV3 {
+    type: 'inner';
+    entries: JoinEntryV3[];
+}
+export interface FullJoinV3 {
+    type: 'full';
+    entries: JoinEntryV3[];
+}
+export interface OuterJoinV3 {
+    type: 'outer';
+    primary: JoinEntryV3;
+    secondary: JoinEntryV3[];
+}
 export interface InnerJoinV2 {
     type: 'inner';
     entries: JoinEntryV2[];
@@ -23,9 +46,14 @@ export interface OuterJoinV2 {
     primary: JoinEntryV2;
     secondary: JoinEntryV2[];
 }
+export type JoinEntryV3 = ColumnJoinEntry | SlicedColumnJoinEntry | InlineColumnJoinEntry | InnerJoinV3 | FullJoinV3 | OuterJoinV3;
 export type JoinEntryV2 = ColumnJoinEntryV2 | SlicedColumnJoinEntry | InnerJoinV2 | FullJoinV2 | OuterJoinV2;
 export interface CreateTableRequestV2 {
     src: JoinEntryV2;
     filters: PTableRecordFilter[];
 }
+export interface CreateTableRequestV3 {
+    src: JoinEntryV3;
+    filters: PTableRecordFilter[];
+}
 //# sourceMappingURL=create_table.d.ts.map

package/dist/pframe/internal_api/create_table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create_table.d.ts","sourceRoot":"","sources":["../../../src/pframe/internal_api/create_table.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,kBAAkB,EAAE,CAAC;CAC5C;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,WAAW,EAAE,CAAC;CAC1B;AAED,MAAM,MAAM,WAAW,GACnB,iBAAiB,GACjB,qBAAqB,GACrB,WAAW,GACX,UAAU,GACV,WAAW,CAAC;AAEhB,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,kBAAkB,EAAE,CAAC;CAC/B"}
+{"version":3,"file":"create_table.d.ts","sourceRoot":"","sources":["../../../src/pframe/internal_api/create_table.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE3G,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,kBAAkB,EAAE,CAAC;CAC5C;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;CACjC;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,WAAW,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,WAAW,EAAE,CAAC;CAC1B;AAED,MAAM,MAAM,WAAW,GACnB,eAAe,GACf,qBAAqB,GACrB,qBAAqB,GACrB,WAAW,GACX,UAAU,GACV,WAAW,CAAC;AAEhB,MAAM,MAAM,WAAW,GACnB,iBAAiB,GACjB,qBAAqB,GACrB,WAAW,GACX,UAAU,GACV,WAAW,CAAC;AAEhB,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,kBAAkB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,kBAAkB,EAAE,CAAC;CAC/B"}

package/dist/pframe/internal_api/pframe.d.ts

@@ -1,8 +1,8 @@
 import { PFrameFactoryAPI } from './api_factory';
-import { PFrameReadAPIV4, PFrameReadAPIV5 } from './api_read';
+import { PFrameReadAPIV5, PFrameReadAPIV6 } from './api_read';
 export type Logger = (level: 'info' | 'warn' | 'error', message: string) => void;
-export interface PFrameV4 extends PFrameFactoryAPI, PFrameReadAPIV4 {
-}
 export interface PFrameV5 extends PFrameFactoryAPI, PFrameReadAPIV5 {
 }
+export interface PFrameV6 extends PFrameFactoryAPI, PFrameReadAPIV6 {
+}
 //# sourceMappingURL=pframe.d.ts.map

package/dist/pframe/internal_api/table.d.ts

@@ -1,41 +1,4 @@
 import { PTableColumnId, PTableColumnSpec, PTableRecordFilter, PTableShape, PTableSorting, PTableVector, TableRange } from '@milaboratories/pl-model-common';
-/**
- * Table view returned as a result of create table operation.
- *
- * PTable can be thought as having a composite primary key, consisting of axes,
- * and a set of data columns derived from PColumn values.
- * */
-export interface PTableV3 {
-    /** Unified table shape */
-    getShape(): PTableShape;
-    /**
-     * Returns ordered array of table axes specs (primary key "columns" in SQL
-     * terms) and data column specs (regular "columns" in SQL terms).
-     *
-     * Data for a specific table column can be retrieved using unified indexing
-     * corresponding to elements in this array.
-     *
-     * Axes are always listed first.
-     * */
-    getSpec(): PTableColumnSpec[];
-    /** Transforms unified column identifiers into unified indices of columns. */
-    getColumnIndices(columnIds: PTableColumnId[]): number[];
-    /**
-     * Retrieve the data from the table. To retrieve only data required, it can be
-     * sliced both horizontally ({@link columnIndices}) and vertically
-     * ({@link range}).
-     *
-     * @param columnIndices unified indices of columns to be retrieved
-     * @param range optionally limit the range of records to retrieve
-     * */
-    getData(columnIndices: number[], range?: TableRange): Promise<PTableVector[]>;
-    /** Filters the table and returns new PTable instance */
-    filter(request: PTableRecordFilter[], signal?: AbortSignal): Promise<PTableV3>;
-    /** Sorts the table and returns new PTable instance. */
-    sort(request: PTableSorting[], signal?: AbortSignal): Promise<PTableV3>;
-    /** Deallocates all underlying resources */
-    dispose(): void;
-}
 /**
  * Table view returned as a result of create table operation.
  *

package/dist/pframe/internal_api/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/pframe/internal_api/table.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACb,YAAY,EACZ,UAAU,EACX,MAAM,iCAAiC,CAAC;AAEzC;;;;;KAKK;AACL,MAAM,WAAW,QAAQ;IACvB,0BAA0B;IAC1B,QAAQ,IAAI,WAAW,CAAC;IAExB;;;;;;;;SAQK;IACL,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAE9B,6EAA6E;IAC7E,gBAAgB,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,CAAC;IAExD;;;;;;;SAOK;IACL,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAE9E,wDAAwD;IACxD,MAAM,CAAC,OAAO,EAAE,kBAAkB,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE/E,uDAAuD;IACvD,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExE,2CAA2C;IAC3C,OAAO,IAAI,IAAI,CAAC;CACjB;AAED;;;;;KAKK;AACL,MAAM,WAAW,QAAQ;IACvB,0BAA0B;IAC1B,QAAQ,IAAI,WAAW,CAAC;IAExB;;;;;;;;SAQK;IACL,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAE9B,6EAA6E;IAC7E,gBAAgB,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,CAAC;IAExD;;;;;;;SAOK;IACL,OAAO,CACL,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,EAAE,UAAU,GAAG,SAAS,EAC7B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAE3B,wDAAwD;IACxD,MAAM,CAAC,OAAO,EAAE,kBAAkB,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE/E,uDAAuD;IACvD,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExE,2CAA2C;IAC3C,OAAO,IAAI,IAAI,CAAC;CACjB"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/pframe/internal_api/table.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACb,YAAY,EACZ,UAAU,EACX,MAAM,iCAAiC,CAAC;AAEzC;;;;;KAKK;AACL,MAAM,WAAW,QAAQ;IACvB,0BAA0B;IAC1B,QAAQ,IAAI,WAAW,CAAC;IAExB;;;;;;;;SAQK;IACL,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAE9B,6EAA6E;IAC7E,gBAAgB,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,CAAC;IAExD;;;;;;;SAOK;IACL,OAAO,CACL,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,EAAE,UAAU,GAAG,SAAS,EAC7B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAE3B,wDAAwD;IACxD,MAAM,CAAC,OAAO,EAAE,kBAAkB,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE/E,uDAAuD;IACvD,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExE,2CAA2C;IAC3C,OAAO,IAAI,IAAI,CAAC;CACjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-model-middle-layer",
-  "version": "1.7.28",
+  "version": "1.7.30",
   "description": "Common model between middle layer and non-block UI code",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",

package/src/pframe/internal_api/api_read.ts

@@ -7,11 +7,11 @@ import {
   UniqueValuesRequest,
   UniqueValuesResponse
 } from '@milaboratories/pl-model-common';
-import { CreateTableRequestV2 } from './create_table';
-import { PTableV3, PTableV4 } from './table';
+import { CreateTableRequestV2, CreateTableRequestV3 } from './create_table';
+import { PTableV4 } from './table';
 
 /** Read interface exposed by PFrames library */
-export interface PFrameReadAPIV4 {
+export interface PFrameReadAPIV5 {
   /**
    * Finds columns given filtering criteria on column name, annotations etc.
    * and a set of qualified axes specs to find only columns with compatible
@@ -32,14 +32,14 @@ export interface PFrameReadAPIV4 {
   listColumns(): Promise<PColumnInfo[]>;
 
   /** Calculates data for the table and returns an object to access it */
-  createTable(request: CreateTableRequestV2, signal?: AbortSignal): Promise<PTableV3>;
+  createTable(request: CreateTableRequestV2, signal?: AbortSignal): Promise<PTableV4>;
 
   /** Calculate set of unique values for a specific axis for the filtered set of records */
   getUniqueValues(request: UniqueValuesRequest, signal?: AbortSignal): Promise<UniqueValuesResponse>;
 }
 
 /** Read interface exposed by PFrames library */
-export interface PFrameReadAPIV5 {
+export interface PFrameReadAPIV6 {
   /**
    * Finds columns given filtering criteria on column name, annotations etc.
    * and a set of qualified axes specs to find only columns with compatible
@@ -60,7 +60,7 @@ export interface PFrameReadAPIV5 {
   listColumns(): Promise<PColumnInfo[]>;
 
   /** Calculates data for the table and returns an object to access it */
-  createTable(request: CreateTableRequestV2, signal?: AbortSignal): Promise<PTableV4>;
+  createTable(request: CreateTableRequestV3, signal?: AbortSignal): Promise<PTableV4>;
 
   /** Calculate set of unique values for a specific axis for the filtered set of records */
   getUniqueValues(request: UniqueValuesRequest, signal?: AbortSignal): Promise<UniqueValuesResponse>;

package/src/pframe/internal_api/create_table.ts

@@ -1,5 +1,10 @@
 import { ConstantAxisFilter } from './common';
-import { PObjectId, PTableRecordFilter } from '@milaboratories/pl-model-common';
+import { JsonDataInfo, PColumnSpec, PObjectId, PTableRecordFilter } from '@milaboratories/pl-model-common';
+
+export interface ColumnJoinEntry {
+  type: 'column';
+  columnId: PObjectId;
+}
 
 export interface ColumnJoinEntryV2 {
   type: 'column';
@@ -13,6 +18,29 @@ export interface SlicedColumnJoinEntry {
   readonly axisFilters: ConstantAxisFilter[];
 }
 
+export interface InlineColumnJoinEntry {
+  readonly type: 'inlineColumn';
+  readonly newId: PObjectId;
+  readonly spec: PColumnSpec;
+  readonly dataInfo: JsonDataInfo;
+}
+
+export interface InnerJoinV3 {
+  type: 'inner';
+  entries: JoinEntryV3[];
+}
+
+export interface FullJoinV3 {
+  type: 'full';
+  entries: JoinEntryV3[];
+}
+
+export interface OuterJoinV3 {
+  type: 'outer';
+  primary: JoinEntryV3;
+  secondary: JoinEntryV3[];
+}
+
 export interface InnerJoinV2 {
   type: 'inner';
   entries: JoinEntryV2[];
@@ -29,6 +57,14 @@ export interface OuterJoinV2 {
   secondary: JoinEntryV2[];
 }
 
+export type JoinEntryV3 = 
+  | ColumnJoinEntry
+  | SlicedColumnJoinEntry
+  | InlineColumnJoinEntry
+  | InnerJoinV3
+  | FullJoinV3
+  | OuterJoinV3;
+
 export type JoinEntryV2 = 
   | ColumnJoinEntryV2
   | SlicedColumnJoinEntry
@@ -40,3 +76,8 @@ export interface CreateTableRequestV2 {
   src: JoinEntryV2;
   filters: PTableRecordFilter[];
 }
+
+export interface CreateTableRequestV3 {
+  src: JoinEntryV3;
+  filters: PTableRecordFilter[];
+}

package/src/pframe/internal_api/pframe.ts

@@ -1,11 +1,11 @@
 import type { PFrameFactoryAPI } from './api_factory';
-import type { PFrameReadAPIV4, PFrameReadAPIV5 } from './api_read';
+import type { PFrameReadAPIV5, PFrameReadAPIV6 } from './api_read';
 
 export type Logger = (
   level: 'info' | 'warn' | 'error',
   message: string
 ) => void;
 
-export interface PFrameV4 extends PFrameFactoryAPI, PFrameReadAPIV4 {}
-
 export interface PFrameV5 extends PFrameFactoryAPI, PFrameReadAPIV5 {}
+
+export interface PFrameV6 extends PFrameFactoryAPI, PFrameReadAPIV6 {}

package/src/pframe/internal_api/table.ts

@@ -8,50 +8,6 @@ import {
   TableRange
 } from '@milaboratories/pl-model-common';
 
-/**
- * Table view returned as a result of create table operation.
- *
- * PTable can be thought as having a composite primary key, consisting of axes,
- * and a set of data columns derived from PColumn values.
- * */
-export interface PTableV3 {
-  /** Unified table shape */
-  getShape(): PTableShape;
-
-  /**
-   * Returns ordered array of table axes specs (primary key "columns" in SQL
-   * terms) and data column specs (regular "columns" in SQL terms).
-   *
-   * Data for a specific table column can be retrieved using unified indexing
-   * corresponding to elements in this array.
-   *
-   * Axes are always listed first.
-   * */
-  getSpec(): PTableColumnSpec[];
-
-  /** Transforms unified column identifiers into unified indices of columns. */
-  getColumnIndices(columnIds: PTableColumnId[]): number[];
-
-  /**
-   * Retrieve the data from the table. To retrieve only data required, it can be
-   * sliced both horizontally ({@link columnIndices}) and vertically
-   * ({@link range}).
-   *
-   * @param columnIndices unified indices of columns to be retrieved
-   * @param range optionally limit the range of records to retrieve
-   * */
-  getData(columnIndices: number[], range?: TableRange): Promise<PTableVector[]>;
-
-  /** Filters the table and returns new PTable instance */
-  filter(request: PTableRecordFilter[], signal?: AbortSignal): Promise<PTableV3>;
-
-  /** Sorts the table and returns new PTable instance. */
-  sort(request: PTableSorting[], signal?: AbortSignal): Promise<PTableV3>;
-
-  /** Deallocates all underlying resources */
-  dispose(): void;
-}
-
 /**
  * Table view returned as a result of create table operation.
  *