@vuu-ui/vuu-data-test 3.3.1 → 3.3.2

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.1",
+  "version": "3.3.2",
   "main": "./src/index.js",
   "author": "heswell",
   "license": "Apache-2.0",
@@ -9,13 +9,13 @@
     "type-defs": "node ../../scripts/build-type-defs.mjs"
   },
   "dependencies": {
-    "@vuu-ui/vuu-data-local": "3.3.1",
-    "@vuu-ui/vuu-utils": "3.3.1"
+    "@vuu-ui/vuu-data-local": "3.3.2",
+    "@vuu-ui/vuu-utils": "3.3.2"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-protocol-types": "3.3.1",
-    "@vuu-ui/vuu-data-types": "3.3.1",
-    "@vuu-ui/vuu-table-types": "3.3.1"
+    "@vuu-ui/vuu-protocol-types": "3.3.2",
+    "@vuu-ui/vuu-data-types": "3.3.2",
+    "@vuu-ui/vuu-table-types": "3.3.2"
   },
   "sideEffects": false,
   "files": [

package/src/TickingArrayDataSource.js

@@ -1,18 +1,19 @@
 import { ArrayDataSource } from "@vuu-ui/vuu-data-local";
-import { StaleUpdateError, isRpcSuccess, isTypeaheadRequest } from "@vuu-ui/vuu-utils";
+import { StaleUpdateError, assertExpectedSessionTable, isRpcSuccess, isTypeaheadRequest, sessionDataSourceConfig } from "@vuu-ui/vuu-utils";
 import { makeSuggestions } from "./makeSuggestions.js";
 class TickingArrayDataSource extends ArrayDataSource {
     #menuRpcServices;
     #pendingVisualLink;
     #rpcMenuServices;
     #rpcServices;
+    #session;
     #sourceTableDataSource;
     #table;
     #selectionLinkSubscribers;
     #visualLinkService;
     #getVisualLinks;
     #vuuModule;
-    constructor({ data, getVisualLinks, rpcServices, rpcMenuServices, table, menu, visualLink, visualLinkService, vuuModule, ...arrayDataSourceProps }){
+    constructor({ data, getVisualLinks, rpcServices, rpcMenuServices, session, table, menu, visualLink, visualLinkService, vuuModule, ...arrayDataSourceProps }){
         if (void 0 === data && void 0 === table) throw Error("TickingArrayDataSource must be constructed with data");
         super({
             ...arrayDataSourceProps,
@@ -23,6 +24,7 @@ class TickingArrayDataSource extends ArrayDataSource {
         this.#rpcMenuServices = rpcMenuServices;
         this.#pendingVisualLink = visualLink;
         this.#rpcServices = rpcServices;
+        this.#session = session;
         this.#table = table;
         this.#visualLinkService = visualLinkService;
         this.#getVisualLinks = getVisualLinks;
@@ -63,7 +65,7 @@ class TickingArrayDataSource extends ArrayDataSource {
     isSessionDataSourceOf(dataSource) {
         return this.#sourceTableDataSource === dataSource;
     }
-    async createSessionDataSource(copyOption, sessionType = "edit") {
+    async createSessionDataSource(copyOption, sessionType = "edit", overrides) {
         const rpcResponse = await this?.rpcRequest?.({
             type: "RPC_REQUEST",
             rpcName: "createSessionTable",
@@ -74,10 +76,13 @@ class TickingArrayDataSource extends ArrayDataSource {
         });
         if (isRpcSuccess(rpcResponse)) {
             const { table: sessionTable } = rpcResponse.data;
-            const baseColumns = this.config.columns.includes("vuuAction") ? this.config.columns : this.config.columns.concat("vuuAction");
+            const effectiveOverrides = overrides ?? this.#session;
+            assertExpectedSessionTable(sessionTable, effectiveOverrides?.table);
+            const sessionConfig = sessionDataSourceConfig(this.config, effectiveOverrides?.columns);
+            const baseColumns = sessionConfig.columns.includes("vuuAction") ? sessionConfig.columns : sessionConfig.columns.concat("vuuAction");
             const columns = "import" !== sessionType || baseColumns.includes("vuuRowNum") ? baseColumns : baseColumns.concat("vuuRowNum");
             const sessionDataSource = this.#vuuModule?.createDataSource(sessionTable.table, sessionTable.table, {
-                ...this.config,
+                ...sessionConfig,
                 columns
             });
             if (sessionDataSource instanceof TickingArrayDataSource) sessionDataSource.#sourceTableDataSource = this;
@@ -85,7 +90,7 @@ class TickingArrayDataSource extends ArrayDataSource {
         }
         throw Error(`[TickingArrayDataSource] createSessionDataSource ${rpcResponse?.errorMessage}`);
     }
-    async beginEditSession(editSessionMode = "all-rows") {
+    async beginEditSession(editSessionMode = "all-rows", overrides) {
         const rpcResponse = await this?.rpcRequest?.({
             type: "RPC_REQUEST",
             rpcName: "beginEditSession",
@@ -95,8 +100,10 @@ class TickingArrayDataSource extends ArrayDataSource {
         });
         if (isRpcSuccess(rpcResponse)) {
             const { table: sessionTable } = rpcResponse.data;
+            const effectiveOverrides = overrides ?? this.#session;
+            assertExpectedSessionTable(sessionTable, effectiveOverrides?.table);
             const sessionDataSource = this.#vuuModule?.createDataSource(sessionTable.table, sessionTable.table, {
-                ...this.config
+                ...sessionDataSourceConfig(this.config, effectiveOverrides?.columns)
             });
             if (sessionDataSource instanceof TickingArrayDataSource) sessionDataSource.#sourceTableDataSource = this;
             return sessionDataSource;

package/src/local-datasource-provider/LocalDatasourceProvider.js

@@ -23,12 +23,13 @@ const serverAPI = {
 };
 const getServerAPI = async ()=>serverAPI;
 class VuuDataSource {
-    constructor({ aggregations, columns, filterSpec, groupBy, sort, table, viewport, visualLink }){
+    constructor({ aggregations, columns, filterSpec, groupBy, session, sort, table, viewport, visualLink }){
         const config = {
             aggregations,
             columns,
             filterSpec,
             groupBy,
+            session,
             sort,
             visualLink
         };

package/types/TickingArrayDataSource.d.ts

@@ -1,5 +1,5 @@
 import { ArrayDataSource, type ArrayDataSourceConstructorProps } from "@vuu-ui/vuu-data-local";
-import type { DataSourceBase, DataSource, DataSourceRowWithBigint, DataSourceSubscribeCallback, DataSourceSubscribeProps, DataSourceVisualLinkCreatedMessage, DeleteRowMode, CopyOption, EditSessionMode, SessionType } from "@vuu-ui/vuu-data-types";
+import type { DataSourceBase, DataSource, DataSourceRowWithBigint, DataSourceSubscribeCallback, DataSourceSubscribeProps, DataSourceVisualLinkCreatedMessage, DeleteRowMode, CopyOption, EditSessionMode, SessionDataSourceOverrides, SessionType } from "@vuu-ui/vuu-data-types";
 import type { LinkDescriptorWithLabel, RpcResultError, RpcResultSuccess, VuuCreateVisualLink, VuuMenu, VuuRemoveVisualLink, VuuRowDataItemType, VuuRpcMenuRequest, VuuRpcMenuResponse, VuuRpcServiceRequest } from "@vuu-ui/vuu-protocol-types";
 import type { IVuuModule, RpcMenuService, RpcService } from "./core/module/VuuModule";
 import type { Table } from "./Table";
@@ -16,7 +16,7 @@ export interface TickingArrayDataSourceConstructorProps extends Omit<ArrayDataSo
 }
 export declare class TickingArrayDataSource extends ArrayDataSource {
     #private;
-    constructor({ data, getVisualLinks, rpcServices, rpcMenuServices, table, menu, visualLink, visualLinkService, vuuModule, ...arrayDataSourceProps }: TickingArrayDataSourceConstructorProps);
+    constructor({ data, getVisualLinks, rpcServices, rpcMenuServices, session, table, menu, visualLink, visualLinkService, vuuModule, ...arrayDataSourceProps }: TickingArrayDataSourceConstructorProps);
     updateRowWithSessionCheck: (row: Array<bigint | VuuRowDataItemType>, columnName?: string, sessionId?: string) => void;
     subscribe(subscribeProps: DataSourceSubscribeProps, callback: DataSourceSubscribeCallback): Promise<void>;
     unsubscribe(): void;
@@ -24,8 +24,8 @@ export declare class TickingArrayDataSource extends ArrayDataSource {
     get links(): LinkDescriptorWithLabel[] | undefined;
     getSelectedRowIds(): string[];
     isSessionDataSourceOf(dataSource: DataSource): boolean;
-    createSessionDataSource(copyOption: CopyOption, sessionType?: SessionType): Promise<DataSourceBase<DataSourceRowWithBigint> | undefined>;
-    beginEditSession(editSessionMode?: EditSessionMode): Promise<DataSourceBase<DataSourceRowWithBigint> | undefined>;
+    createSessionDataSource(copyOption: CopyOption, sessionType?: SessionType, overrides?: SessionDataSourceOverrides): Promise<DataSourceBase<DataSourceRowWithBigint> | undefined>;
+    beginEditSession(editSessionMode?: EditSessionMode, overrides?: SessionDataSourceOverrides): Promise<DataSourceBase<DataSourceRowWithBigint> | undefined>;
     editCell(key: string, column: string, data: VuuRowDataItemType): Promise<RpcResultSuccess | RpcResultError>;
     addRow: (rowData?: Record<string, VuuRowDataItemType>) => Promise<true | string>;
     deleteRow: (key: string, mode?: DeleteRowMode) => Promise<true | string>;

package/types/core/module/VuuModule.d.ts

@@ -1,9 +1,11 @@
-import type { DataSourceBase, DataSourceConfig, DataSourceRowWithBigint, DataSourceSubscribedMessage, DataSourceVisualLinkCreatedMessage, EditSessionMode, CopyOption, SessionType, TableSchema } from "@vuu-ui/vuu-data-types";
+import type { DataSourceBase, DataSourceConfig, DataSourceRowWithBigint, DataSourceSubscribedMessage, DataSourceVisualLinkCreatedMessage, EditSessionMode, CopyOption, SessionDataSourceOverrides, SessionType, TableSchema } from "@vuu-ui/vuu-data-types";
 import type { VuuMenu, VuuLink, LinkDescriptorWithLabel, VuuRpcMenuResponse, VuuCreateVisualLink, VuuRemoveVisualLink, VuuRpcServiceRequest, RpcResultSuccess, RpcResultError, VuuRpcMenuRequest } from "@vuu-ui/vuu-protocol-types";
 import { Table } from "../../Table";
 import { TickingArrayDataSource } from "../../TickingArrayDataSource";
 export interface IVuuModule<T extends string = string> {
-    createDataSource: (tableName: T, viewport?: string, config?: DataSourceConfig) => DataSourceBase<DataSourceRowWithBigint>;
+    createDataSource: (tableName: T, viewport?: string, config?: DataSourceConfig & {
+        session?: SessionDataSourceOverrides;
+    }) => DataSourceBase<DataSourceRowWithBigint>;
 }
 export type SessionTableMap = Record<string, Table>;
 export type ServiceHandler = (rpcRequest: VuuRpcServiceRequest) => Promise<RpcResultSuccess | RpcResultError>;
@@ -46,7 +48,9 @@ export declare abstract class VuuModule<T extends string = string> implements IV
     getLinks: (subscriptionMap: Map<string, Subscription[]>, vuuLinks: VuuLink[]) => LinkDescriptorWithLabel[];
     visualLinkService: (message: VuuCreateVisualLink | VuuRemoveVisualLink) => Promise<DataSourceVisualLinkCreatedMessage | void>;
     getVisualLinks: (tableName: string) => LinkDescriptorWithLabel[] | undefined;
-    createDataSource: (tableName: T, viewport?: string, config?: DataSourceConfig) => DataSourceBase<DataSourceRowWithBigint>;
+    createDataSource: (tableName: T, viewport?: string, config?: DataSourceConfig & {
+        session?: SessionDataSourceOverrides;
+    }) => DataSourceBase<DataSourceRowWithBigint>;
     getServices(tableName: T): RpcService[];
     getMenuServices(tableName: T): RpcMenuService[];
     protected get sessionTableMap(): SessionTableMap;