@deephaven/jsapi-types 1.0.0-dev0.40.0 → 1.0.0-dev0.40.1

package/dist/index.d.ts

@@ -17,37 +17,6 @@ export interface IIterableResult<T> {
 }
 export namespace dh.storage {
 
-	/**
-	* Storage service metadata about files and folders.
-	*/
-	export class ItemDetails {
-		protected constructor();
-
-		toString():string;
-		get filename():string;
-		get basename():string;
-		get size():number;
-		get etag():string;
-		get type():ItemTypeType;
-		get dirname():string;
-	}
-
-	/**
-	* Represents a file's contents loaded from the server. If an etag was specified when loading, client should first test
-	* if the etag of this instance matches - if so, the contents will be empty, and the client's existing contents should
-	* be used.
-	*/
-	export class FileContents {
-		protected constructor();
-
-		static blob(blob:Blob):FileContents;
-		static text(...text:string[]):FileContents;
-		static arrayBuffers(...buffers:ArrayBuffer[]):FileContents;
-		text():Promise<string>;
-		arrayBuffer():Promise<ArrayBuffer>;
-		get etag():string;
-	}
-
 	/**
 	* Remote service to read and write files on the server. Paths use "/" as a separator, and should not start with "/".
 	*/
@@ -106,6 +75,37 @@ export namespace dh.storage {
 		createDirectory(path:string):Promise<void>;
 	}
 
+	/**
+	* Represents a file's contents loaded from the server. If an etag was specified when loading, client should first test
+	* if the etag of this instance matches - if so, the contents will be empty, and the client's existing contents should
+	* be used.
+	*/
+	export class FileContents {
+		protected constructor();
+
+		static blob(blob:Blob):FileContents;
+		static text(...text:string[]):FileContents;
+		static arrayBuffers(...buffers:ArrayBuffer[]):FileContents;
+		text():Promise<string>;
+		arrayBuffer():Promise<ArrayBuffer>;
+		get etag():string;
+	}
+
+	/**
+	* Storage service metadata about files and folders.
+	*/
+	export class ItemDetails {
+		protected constructor();
+
+		toString():string;
+		get filename():string;
+		get basename():string;
+		get size():number;
+		get etag():string;
+		get type():ItemTypeType;
+		get dirname():string;
+	}
+
 
 	type ItemTypeType = string;
 	export class ItemType {
@@ -117,172 +117,6 @@ export namespace dh.storage {
 
 export namespace dh {
 
-	/**
-	* Options for requesting a viewport subscription to a table.
-	*/
-	export interface ViewportSubscriptionOptions extends SubscriptionOptions {
-		/**
-		* If true, the viewport will be filled starting from the end of the table, where 0 is the last row of the
-		* table. Default is false.
-		*/
-		isReverseViewport?:boolean|null;
-		/**
-		* The rows to include in the viewport. This can be either a {@link dh.RangeSet} or a single range with
-		* `first` and `last` properties.
-		*/
-		rows:RangeSet|SimpleRange;
-	}
-	/**
-	* Event data, describing the indexes that were added/removed/updated, and providing access to Rows (and thus data in
-	* columns) either by index, or scanning the complete present index.
-	* <p>
-	* This class supports two ways of reading the table - checking the changes made since the last update, and reading all
-	* data currently in the table. While it is more expensive to always iterate over every single row in the table, it may
-	* in some cases actually be cheaper than maintaining state separately and updating only the changes, though both
-	* options should be considered.
-	* <p>
-	* The RangeSet objects allow iterating over the LongWrapper indexes in the table. Note that these "indexes" are not
-	* necessarily contiguous and may be negative, and represent some internal state on the server, allowing it to keep
-	* track of data efficiently. Those LongWrapper objects can be passed to the various methods on this instance to read
-	* specific rows or cells out of the table.
-	*/
-	export interface SubscriptionTableData extends TableData {
-		get fullIndex():RangeSet;
-		/**
-		* The ordered set of row indexes removed since the last update
-		* @return the rangeset of removed rows
-		*/
-		get removed():RangeSet;
-		/**
-		* The ordered set of row indexes added since the last update.
-		* @return the rangeset of rows added
-		*/
-		get added():RangeSet;
-		get columns():Array<Column>;
-		/**
-		* The ordered set of row indexes updated since the last update
-		* @return the rnageset of modified rows
-		*/
-		get modified():RangeSet;
-		/**
-		* A lazily computed array of all rows available on the client.
-		*/
-		get rows():Array<Row>;
-	}
-	/**
-	* This object may be pooled internally or discarded and not updated. Do not retain references to it.
-	*/
-	export interface Format {
-		/**
-		* The format string to apply to the value of this cell.
-		* @return String
-		*/
-		readonly formatString?:string|null;
-		/**
-		* Color to apply to the cell's background, in <b>#rrggbb</b> format.
-		* @return String
-		*/
-		readonly backgroundColor?:string|null;
-		/**
-		* Color to apply to the text, in <b>#rrggbb</b> format.
-		* @return String
-		*/
-		readonly color?:string|null;
-		/**
-		* 
-		* @deprecated Prefer formatString. Number format string to apply to the value in this cell.
-		*/
-		readonly numberFormat?:string|null;
-	}
-	/**
-	* Represents a table which can be joined to another table. Current implementations are {@link dh.Table} and
-	* {@link dh.TotalsTable}.
-	*/
-	export interface JoinableTable {
-		freeze():Promise<Table>;
-		snapshot(baseTable:Table, doInitialSnapshot?:boolean, stampColumns?:string[]):Promise<Table>;
-		/**
-		* Joins this table to the provided table, using one of the specified join types:
-		* <ul>
-		* <li><code>AJ</code>, <code>ReverseAJ</code> (or <code>RAJ</code>) - inexact timeseries joins, based on the
-		* provided matching rule.</li>
-		* <li><code>CROSS_JOIN</code> (or <code>Join</code>) - cross join of all rows that have matching values in both
-		* tables.</li>
-		* <li><code>EXACT_JOIN</code> (or <code>ExactJoin</code> - matches values in exactly one row in the right table,
-		* with errors if there is not exactly one.</li>
-		* <li><code>NATURAL_JOIN</code> (or <code>Natural</code> - matches values in at most one row in the right table,
-		* with nulls if there is no match or errors if there are multiple matches.</li>
-		* </ul>
-		*
-		* Note that <code>Left</code> join is not supported here, unlike DHE.
-		* <p>
-		* See the <a href="https://deephaven.io/core/docs/conceptual/choose-joins/">Choose a join method</a> document for
-		* more guidance on picking a join operation.
-		* @deprecated Instead, call the specific method for the join type.
-		* @param joinType - The type of join to perform, see the list above.
-		* @param rightTable - The table to match to values in this table
-		* @param columnsToMatch - Columns that should match
-		* @param columnsToAdd - Columns from the right table to add to the result - empty/null/absent to add all columns
-		* @param asOfMatchRule - If joinType is AJ/RAJ/ReverseAJ, the match rule to use
-		* @return a promise that will resolve to the joined table
-		*/
-		join(joinType:string, rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
-		/**
-		* Performs an inexact timeseries join, where rows in this table will have columns added from the closest matching
-		* row from the right table.
-		* <p>
-		* The `asOfMatchRule` value can be one of:
-		* <ul>
-		* <li>LESS_THAN_EQUAL</li>
-		* <li>LESS_THAN</li>
-		* <li>GREATER_THAN_EQUAL</li>
-		* <li>GREATER_THAN</li>
-		* </ul>
-		* @param rightTable - the table to match to values in this table
-		* @param columnsToMatch - the columns that should match, according to the asOfMatchRole
-		* @param columnsToAdd - columns from the right table to add to the resulting table, empty/null/absent to add all
-		*        columns
-		* @param asOfMatchRule - the match rule to use, see above
-		* @return a promise that will resolve to the joined table
-		*/
-		asOfJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
-		/**
-		* a promise that will be resolved with the newly created table holding the results of the specified cross join
-		* operation. The <b>columnsToAdd</b> parameter is optional, not specifying it will result in all columns from the
-		* right table being added to the output. The <b>reserveBits</b> optional parameter lets the client control how the
-		* key space is distributed between the rows in the two tables, see the Java <b>Table</b> class for details.
-		* @param rightTable - the table to match to values in this table
-		* @param columnsToMatch - the columns that should match exactly
-		* @param columnsToAdd - columns from the right table to add to the resulting table, empty/null/absent to add all
-		*        columns
-		* @param reserveBits - the number of bits of key-space to initially reserve per group, null/absent will let the
-		*        server select a value
-		* @return a promise that will resolve to the joined table
-		*/
-		crossJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, reserveBits?:number|undefined|null):Promise<Table>;
-		/**
-		* a promise that will be resolved with the newly created table holding the results of the specified exact join
-		* operation. The `columnsToAdd` parameter is optional, not specifying it will result in all columns from the right
-		* table being added to the output.
-		* @param rightTable - the table to match to values in this table
-		* @param columnsToMatch - the columns that should match exactly
-		* @param columnsToAdd - columns from the right table to add to the resulting table, empty/null/absent to add all
-		*        columns
-		* @return a promise that will resolve to the joined table
-		*/
-		exactJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null):Promise<Table>;
-		/**
-		* a promise that will be resolved with the newly created table holding the results of the specified natural join
-		* operation. The <b>columnsToAdd</b> parameter is optional, not specifying it will result in all columns from the
-		* right table being added to the output.
-		* @param rightTable - the table to match to values in this table
-		* @param columnsToMatch - the columns that should match exactly
-		* @param columnsToAdd - columns from the right table to add to the resulting table, empty/null/absent to add all
-		*        columns
-		* @return a promise that will resolve to the joined table
-		*/
-		naturalJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null):Promise<Table>;
-	}
 	/**
 	* Behaves like a Table, but doesn't expose all of its API for changing the internal state. Instead, state is driven by
 	* the upstream table - when it changes handle, this listens and updates its own handle accordingly.
@@ -438,80 +272,51 @@ export namespace dh {
 		get isRefreshing():boolean;
 	}
 	/**
-	* Options for requesting a full-table subscription to a table.
+	* Wrap LocalTime values for use in JS. Provides text formatting for display and access to the underlying value.
 	*/
-	export interface SubscriptionOptions extends DataOptions {
-		/**
-		* Minimum interval between updates, in milliseconds. If not specified, the server default will be used,
-		* typically 1000ms.
-		* <p>
-		* Note that setting this to smaller values will not necessarily result in more frequent updates - the server
-		* may not propagate updates that frequently, or there may be no updates to propagate.
-		*/
-		updateIntervalMs?:number|null;
+	export interface LocalTimeWrapper {
+		valueOf():string;
+		getHour():number;
+		getMinute():number;
+		getSecond():number;
+		getNano():number;
+		toString():string;
 	}
-	/**
-	* Similar to {@link dh.ViewportData}, but with additional properties to reflect
-	* the tree structure.
-	*/
-	export interface TreeViewportData extends TableData {
-		get(index:LongWrapper|number):TreeRow;
-		getData(index:LongWrapper|number, column:Column):any;
-		getFormat(index:LongWrapper|number, column:Column):Format;
-		get treeSize():number;
+	export interface HasEventHandling {
 		/**
-		* The position of the first returned row within the tree.
-		*/
-		get offset():number;
-		get columns():Array<Column>;
-		get rows():Array<TreeRow>;
-	}
-	export interface RefreshToken {
-		get bytes():string;
-		get expiry():number;
-	}
-	/**
-	* Represents statistics for a given table column.
-	*/
-	export interface ColumnStatistics {
-		/**
-		* Gets the type of formatting that should be used for given statistic.
-		* <p>
-		* the format type for a statistic. A null return value means that the column formatting should be used.
-		* @param name - the display name of the statistic
-		* @return String
-		*/
-		getType(name:string):string;
-		/**
-		* Gets a map with the name of each unique value as key and the count as the value. A map of each unique value's
-		* name to the count of how many times it occurred in the column. This map will be empty for tables containing more
-		* than 19 unique values.
-		* @return Map of String double
+		* Listen for events on this object.
+		* @param name - the name of the event to listen for
+		* @param callback - a function to call when the event occurs
+		* @return Returns a cleanup function.
+		* @typeParam T - the type of the data that the event will provide
 		*/
-		get uniqueValues():Map<string, number>;
+		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
+		hasListeners(name:string):boolean;
 		/**
-		* Gets a map with the display name of statistics as keys and the numeric stat as a value.
-		* <p>
-		* A map of each statistic's name to its value.
-		* @return Map of String and Object
+		* Removes an event listener added to this table.
+		* @param name - 
+		* @param callback - 
+		* @return 
+		* @typeParam T - 
 		*/
-		get statisticsMap():Map<string, object>;
+		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
 	}
 	/**
-	* Simple range consisting only of start and end numbers. Will be migrated to deephaven-core in the near future, and
-	* subsequently removed from this the coreplus namespace.
+	* Similar to {@link dh.ViewportData}, but with additional properties to reflect
+	* the tree structure.
 	*/
-	export interface SimpleRange {
-		first:number;
-		last:number;
-	}
-	export interface WorkerHeapInfo {
+	export interface TreeViewportData extends TableData {
+		get(index:LongWrapper|number):TreeRow;
+		getData(index:LongWrapper|number, column:Column):any;
+		getFormat(index:LongWrapper|number, column:Column):Format;
+		get treeSize():number;
 		/**
-		* Total heap size available for this worker.
+		* The position of the first returned row within the tree.
 		*/
-		get totalHeapSize():number;
-		get freeMemory():number;
-		get maximumHeapSize():number;
+		get offset():number;
+		get columns():Array<Column>;
+		get rows():Array<TreeRow>;
 	}
 	/**
 	* This object may be pooled internally or discarded and not updated. Do not retain references to it. Instead,
@@ -523,132 +328,259 @@ export namespace dh {
 		get index():LongWrapper;
 	}
 	/**
-	* Wrap LocalDate values for use in JS. Provides text formatting for display and access to the underlying value.
+	* Options for requesting a preview of columns when requesting table data. The two properties
+	* {@link dh.convertArrayToString} and {@link dh.array} are mutually exclusive.
 	*/
-	export interface LocalDateWrapper {
-		valueOf():string;
-		getYear():number;
-		getMonthValue():number;
-		getDayOfMonth():number;
-		toString():string;
+	export interface PreviewOptions {
+		/**
+		* If true, any array columns will be converted to strings for preview purposes. This is the legacy behavior.
+		*/
+		convertArrayToString?:boolean|null;
+		/**
+		* Specifies the length of the array to serialize. If the array is longer than this length, one extra element
+		* will be included - the client is expected to truncate the array and append "..." to indicate that there are
+		* additional elements. Negative values indicate that the values should be counted from the end of the array
+		* rather than the beginning. Zero or null indicate that the entire array should be serialized. The default is
+		* null.
+		*/
+		array?:number|null;
 	}
 	/**
-	* Common interface for various ways of accessing table data and formatting for viewport or non-viewport subscriptions
-	* on tables, data in trees, and snapshots.
+	* Event data, describing the indexes that were added/removed/updated, and providing access to Rows (and thus data in
+	* columns) either by index, or scanning the complete present index.
 	* <p>
-	* Generally speaking, it is more efficient to access data in column-major order, rather than iterating through each Row
-	* and accessing all columns that it holds. The {@link rows} accessor can be useful to read row data, but may
-	* incur other costs - it is likely faster to access data by columns using {@link getData}.
+	* This class supports two ways of reading the table - checking the changes made since the last update, and reading all
+	* data currently in the table. While it is more expensive to always iterate over every single row in the table, it may
+	* in some cases actually be cheaper than maintaining state separately and updating only the changes, though both
+	* options should be considered.
+	* <p>
+	* The RangeSet objects allow iterating over the LongWrapper indexes in the table. Note that these "indexes" are not
+	* necessarily contiguous and may be negative, and represent some internal state on the server, allowing it to keep
+	* track of data efficiently. Those LongWrapper objects can be passed to the various methods on this instance to read
+	* specific rows or cells out of the table.
 	*/
-	export interface TableData {
+	export interface SubscriptionTableData extends TableData {
+		get fullIndex():RangeSet;
 		/**
-		* Reads a row object from the table, from which any subscribed column can be read.
-		* @param index - the position or key to access
-		* @return the row at the given location
+		* The ordered set of row indexes removed since the last update
+		* @return the rangeset of removed rows
 		*/
-		get(index:LongWrapper|number):Row;
+		get removed():RangeSet;
 		/**
-		* Reads a specific cell from the table, by row key and column.
-		* @param index - the row in the table to get data from
-		* @param column - the column to read
-		* @return the value in the table
+		* The ordered set of row indexes added since the last update.
+		* @return the rangeset of rows added
 		*/
-		getData(index:LongWrapper|number, column:Column):any;
+		get added():RangeSet;
+		get columns():Array<Column>;
 		/**
-		* The server-specified Format to use for the cell at the given position.
-		* @param index - the row to read
-		* @param column - the column to read
-		* @return a Format instance with any server-specified details
+		* The ordered set of row indexes updated since the last update
+		* @return the rnageset of modified rows
 		*/
-		getFormat(index:LongWrapper|number, column:Column):Format;
-		get columns():Array<Column>;
+		get modified():RangeSet;
 		/**
 		* A lazily computed array of all rows available on the client.
 		*/
 		get rows():Array<Row>;
 	}
 	/**
-	* Represents the contents of a single widget data message from the server, with a binary data paylod and exported
-	* objects. Implemented both by Widget itself and by the `event.details` when data is received by the client.
-	*
-	* Terminology note: the name of this type should probably use "Data" instead of "Message", and the methods should use
-	* "payload" rather than "data" to match other platforms and the protobuf itself. These names are instead used for
-	* backwards compatibility and to better follow JS expectations.
+	* Similar to the browser `CustomEvent` type, this class holds only the type of the event, and optionally some
+	* details about the event.
+	* @typeParam T - the type of the event detail
 	*/
-	export interface WidgetMessageDetails {
+	export interface Event<T> {
+		get detail():T;
+		get type():string;
+	}
+	/**
+	* This object may be pooled internally or discarded and not updated. Do not retain references to it.
+	*/
+	export interface Format {
 		/**
-		* Returns the data from this message as a base64-encoded string.
+		* The format string to apply to the value of this cell.
+		* @return String
 		*/
-		getDataAsBase64():string;
+		readonly formatString?:string|null;
 		/**
-		* Returns the data from this message as a Uint8Array.
+		* Color to apply to the cell's background, in <b>#rrggbb</b> format.
+		* @return String
 		*/
-		getDataAsU8():Uint8Array;
+		readonly backgroundColor?:string|null;
 		/**
-		* Returns the data from this message as a utf-8 string.
+		* Color to apply to the text, in <b>#rrggbb</b> format.
+		* @return String
 		*/
-		getDataAsString():string;
+		readonly color?:string|null;
 		/**
-		* Returns an array of exported objects sent from the server. The plugin implementation is now responsible for these
-		* objects, and should close them when no longer needed.
+		* 
+		* @deprecated Prefer formatString. Number format string to apply to the value in this cell.
 		*/
-		get exportedObjects():WidgetExportedObject[];
+		readonly numberFormat?:string|null;
 	}
 	/**
-	* Options for requesting table data, either as a snapshot or a subscription. See subtypes for more specific options:
-	* <ul>
-	* <li>{@link dh.SnapshotOptions} for snapshot-specific options</li>
-	* <li>{@link dh.SubscriptionOptions} for full-table subscription-specific options</li>
-	* <li>{@link dh.ViewportSubscriptionOptions} for viewport subscription-specific options</li>
-	* </ul>
+	* Options for requesting a full-table subscription to a table.
 	*/
-	export interface DataOptions {
+	export interface SubscriptionOptions extends DataOptions {
 		/**
-		* Optional preview instructions for columns in the table data.
+		* Minimum interval between updates, in milliseconds. If not specified, the server default will be used,
+		* typically 1000ms.
+		* <p>
+		* Note that setting this to smaller values will not necessarily result in more frequent updates - the server
+		* may not propagate updates that frequently, or there may be no updates to propagate.
 		*/
-		previewOptions?:PreviewOptions|null;
+		updateIntervalMs?:number|null;
+	}
+	/**
+	* Represents a row available in a subscription/snapshot on the client. Do not retain references to rows - they will
+	* not function properly when the event isn't actively going off (or promise resolving). Instead, wait for the next
+	* event, or re-request the viewport data.
+	*/
+	export interface Row {
+		get(column:Column):any;
+		getFormat(column:Column):Format;
+		get index():LongWrapper;
+	}
+	/**
+	* Represents statistics for a given table column.
+	*/
+	export interface ColumnStatistics {
 		/**
-		* Required property to indicate which columns should be included in the table data.
+		* Gets the type of formatting that should be used for given statistic.
+		* <p>
+		* the format type for a statistic. A null return value means that the column formatting should be used.
+		* @param name - the display name of the statistic
+		* @return String
 		*/
-		columns:Array<Column>;
-	}
-	export interface HasEventHandling {
+		getType(name:string):string;
 		/**
-		* Listen for events on this object.
-		* @param name - the name of the event to listen for
-		* @param callback - a function to call when the event occurs
-		* @return Returns a cleanup function.
-		* @typeParam T - the type of the data that the event will provide
+		* Gets a map with the name of each unique value as key and the count as the value. A map of each unique value's
+		* name to the count of how many times it occurred in the column. This map will be empty for tables containing more
+		* than 19 unique values.
+		* @return Map of String double
 		*/
-		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
-		hasListeners(name:string):boolean;
+		get uniqueValues():Map<string, number>;
 		/**
-		* Removes an event listener added to this table.
-		* @param name - 
-		* @param callback - 
-		* @return 
-		* @typeParam T - 
+		* Gets a map with the display name of statistics as keys and the numeric stat as a value.
+		* <p>
+		* A map of each statistic's name to its value.
+		* @return Map of String and Object
 		*/
-		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
-	}
-	export interface LayoutHints {
-		readonly searchDisplayMode?:SearchDisplayModeType|null;
-
-		get hiddenColumns():string[]|null;
-		get frozenColumns():string[]|null;
-		get columnGroups():ColumnGroup[]|null;
-		get areSavedLayoutsAllowed():boolean;
-		get frontColumns():string[]|null;
-		get backColumns():string[]|null;
+		get statisticsMap():Map<string, object>;
 	}
 	/**
-	* Extends {@link dh.TableData}, but only contains data in the current viewport. The only API change from TableData is that
-	* ViewportData also contains the offset to this data, so that the actual row number may be determined.
-	* <p>
-	* For viewport subscriptions, it is not necessary to read with the key, only with the position.
-	* <p>
-	* Do not assume that the first row in `rows` is the first visible row, because extra rows may be provided for easier
+	* Options for requesting a snapshot of a table.
+	*/
+	export interface SnapshotOptions extends DataOptions {
+		/**
+		* If true, the snapshot will be filled starting from the end of the table, where 0 is the last row of the
+		* table. Default is false.
+		*/
+		isReverseViewport?:boolean|null;
+		/**
+		* The rows to include in the snapshot. This can be either a {@link dh.RangeSet} or a single range with
+		* `first` and `last` properties.
+		*/
+		rows:RangeSet|SimpleRange;
+	}
+	export interface RefreshToken {
+		get bytes():string;
+		get expiry():number;
+	}
+	/**
+	* Represents a table which can be joined to another table. Current implementations are {@link dh.Table} and
+	* {@link dh.TotalsTable}.
+	*/
+	export interface JoinableTable {
+		freeze():Promise<Table>;
+		snapshot(baseTable:Table, doInitialSnapshot?:boolean, stampColumns?:string[]):Promise<Table>;
+		/**
+		* Joins this table to the provided table, using one of the specified join types:
+		* <ul>
+		* <li><code>AJ</code>, <code>ReverseAJ</code> (or <code>RAJ</code>) - inexact timeseries joins, based on the
+		* provided matching rule.</li>
+		* <li><code>CROSS_JOIN</code> (or <code>Join</code>) - cross join of all rows that have matching values in both
+		* tables.</li>
+		* <li><code>EXACT_JOIN</code> (or <code>ExactJoin</code> - matches values in exactly one row in the right table,
+		* with errors if there is not exactly one.</li>
+		* <li><code>NATURAL_JOIN</code> (or <code>Natural</code> - matches values in at most one row in the right table,
+		* with nulls if there is no match or errors if there are multiple matches.</li>
+		* </ul>
+		*
+		* Note that <code>Left</code> join is not supported here, unlike DHE.
+		* <p>
+		* See the <a href="https://deephaven.io/core/docs/conceptual/choose-joins/">Choose a join method</a> document for
+		* more guidance on picking a join operation.
+		* @deprecated Instead, call the specific method for the join type.
+		* @param joinType - The type of join to perform, see the list above.
+		* @param rightTable - The table to match to values in this table
+		* @param columnsToMatch - Columns that should match
+		* @param columnsToAdd - Columns from the right table to add to the result - empty/null/absent to add all columns
+		* @param asOfMatchRule - If joinType is AJ/RAJ/ReverseAJ, the match rule to use
+		* @return a promise that will resolve to the joined table
+		*/
+		join(joinType:string, rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
+		/**
+		* Performs an inexact timeseries join, where rows in this table will have columns added from the closest matching
+		* row from the right table.
+		* <p>
+		* The `asOfMatchRule` value can be one of:
+		* <ul>
+		* <li>LESS_THAN_EQUAL</li>
+		* <li>LESS_THAN</li>
+		* <li>GREATER_THAN_EQUAL</li>
+		* <li>GREATER_THAN</li>
+		* </ul>
+		* @param rightTable - the table to match to values in this table
+		* @param columnsToMatch - the columns that should match, according to the asOfMatchRole
+		* @param columnsToAdd - columns from the right table to add to the resulting table, empty/null/absent to add all
+		*        columns
+		* @param asOfMatchRule - the match rule to use, see above
+		* @return a promise that will resolve to the joined table
+		*/
+		asOfJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
+		/**
+		* a promise that will be resolved with the newly created table holding the results of the specified cross join
+		* operation. The <b>columnsToAdd</b> parameter is optional, not specifying it will result in all columns from the
+		* right table being added to the output. The <b>reserveBits</b> optional parameter lets the client control how the
+		* key space is distributed between the rows in the two tables, see the Java <b>Table</b> class for details.
+		* @param rightTable - the table to match to values in this table
+		* @param columnsToMatch - the columns that should match exactly
+		* @param columnsToAdd - columns from the right table to add to the resulting table, empty/null/absent to add all
+		*        columns
+		* @param reserveBits - the number of bits of key-space to initially reserve per group, null/absent will let the
+		*        server select a value
+		* @return a promise that will resolve to the joined table
+		*/
+		crossJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, reserveBits?:number|undefined|null):Promise<Table>;
+		/**
+		* a promise that will be resolved with the newly created table holding the results of the specified exact join
+		* operation. The `columnsToAdd` parameter is optional, not specifying it will result in all columns from the right
+		* table being added to the output.
+		* @param rightTable - the table to match to values in this table
+		* @param columnsToMatch - the columns that should match exactly
+		* @param columnsToAdd - columns from the right table to add to the resulting table, empty/null/absent to add all
+		*        columns
+		* @return a promise that will resolve to the joined table
+		*/
+		exactJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null):Promise<Table>;
+		/**
+		* a promise that will be resolved with the newly created table holding the results of the specified natural join
+		* operation. The <b>columnsToAdd</b> parameter is optional, not specifying it will result in all columns from the
+		* right table being added to the output.
+		* @param rightTable - the table to match to values in this table
+		* @param columnsToMatch - the columns that should match exactly
+		* @param columnsToAdd - columns from the right table to add to the resulting table, empty/null/absent to add all
+		*        columns
+		* @return a promise that will resolve to the joined table
+		*/
+		naturalJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null):Promise<Table>;
+	}
+	/**
+	* Extends {@link dh.TableData}, but only contains data in the current viewport. The only API change from TableData is that
+	* ViewportData also contains the offset to this data, so that the actual row number may be determined.
+	* <p>
+	* For viewport subscriptions, it is not necessary to read with the key, only with the position.
+	* <p>
+	* Do not assume that the first row in `rows` is the first visible row, because extra rows may be provided for easier
 	* scrolling without going to the server.
 	*/
 	export interface ViewportData extends TableData {
@@ -665,10 +597,83 @@ export namespace dh {
 		get columns():Array<Column>;
 		get rows():Array<ViewportRow>;
 	}
-	export interface ColumnGroup {
-		get name():string|null;
-		get children():string[]|null;
-		get color():string|null;
+	/**
+	* Options for requesting table data, either as a snapshot or a subscription. See subtypes for more specific options:
+	* <ul>
+	* <li>{@link dh.SnapshotOptions} for snapshot-specific options</li>
+	* <li>{@link dh.SubscriptionOptions} for full-table subscription-specific options</li>
+	* <li>{@link dh.ViewportSubscriptionOptions} for viewport subscription-specific options</li>
+	* </ul>
+	*/
+	export interface DataOptions {
+		/**
+		* Optional preview instructions for columns in the table data.
+		*/
+		previewOptions?:PreviewOptions|null;
+		/**
+		* Required property to indicate which columns should be included in the table data.
+		*/
+		columns:Array<Column>;
+	}
+	/**
+	* Options for requesting a viewport subscription to a table.
+	*/
+	export interface ViewportSubscriptionOptions extends SubscriptionOptions {
+		/**
+		* If true, the viewport will be filled starting from the end of the table, where 0 is the last row of the
+		* table. Default is false.
+		*/
+		isReverseViewport?:boolean|null;
+		/**
+		* The rows to include in the viewport. This can be either a {@link dh.RangeSet} or a single range with
+		* `first` and `last` properties.
+		*/
+		rows:RangeSet|SimpleRange;
+	}
+	/**
+	* Common interface for various ways of accessing table data and formatting for viewport or non-viewport subscriptions
+	* on tables, data in trees, and snapshots.
+	* <p>
+	* Generally speaking, it is more efficient to access data in column-major order, rather than iterating through each Row
+	* and accessing all columns that it holds. The {@link rows} accessor can be useful to read row data, but may
+	* incur other costs - it is likely faster to access data by columns using {@link getData}.
+	*/
+	export interface TableData {
+		/**
+		* Reads a row object from the table, from which any subscribed column can be read.
+		* @param index - the position or key to access
+		* @return the row at the given location
+		*/
+		get(index:LongWrapper|number):Row;
+		/**
+		* Reads a specific cell from the table, by row key and column.
+		* @param index - the row in the table to get data from
+		* @param column - the column to read
+		* @return the value in the table
+		*/
+		getData(index:LongWrapper|number, column:Column):any;
+		/**
+		* The server-specified Format to use for the cell at the given position.
+		* @param index - the row to read
+		* @param column - the column to read
+		* @return a Format instance with any server-specified details
+		*/
+		getFormat(index:LongWrapper|number, column:Column):Format;
+		get columns():Array<Column>;
+		/**
+		* A lazily computed array of all rows available on the client.
+		*/
+		get rows():Array<Row>;
+	}
+	/**
+	* Wrap LocalDate values for use in JS. Provides text formatting for display and access to the underlying value.
+	*/
+	export interface LocalDateWrapper {
+		valueOf():string;
+		getYear():number;
+		getMonthValue():number;
+		getDayOfMonth():number;
+		toString():string;
 	}
 	/**
 	* Represents a server-side object that may not yet have been fetched by the client. When this object will no longer be
@@ -703,34 +708,31 @@ export namespace dh {
 		close():void;
 	}
 	/**
-	* Wrap LocalTime values for use in JS. Provides text formatting for display and access to the underlying value.
-	*/
-	export interface LocalTimeWrapper {
-		valueOf():string;
-		getHour():number;
-		getMinute():number;
-		getSecond():number;
-		getNano():number;
-		toString():string;
-	}
-	/**
-	* Similar to the browser `CustomEvent` type, this class holds only the type of the event, and optionally some
-	* details about the event.
-	* @typeParam T - the type of the event detail
-	*/
-	export interface Event<T> {
-		get detail():T;
-		get type():string;
-	}
-	/**
-	* Represents a row available in a subscription/snapshot on the client. Do not retain references to rows - they will
-	* not function properly when the event isn't actively going off (or promise resolving). Instead, wait for the next
-	* event, or re-request the viewport data.
+	* Represents the contents of a single widget data message from the server, with a binary data paylod and exported
+	* objects. Implemented both by Widget itself and by the `event.details` when data is received by the client.
+	*
+	* Terminology note: the name of this type should probably use "Data" instead of "Message", and the methods should use
+	* "payload" rather than "data" to match other platforms and the protobuf itself. These names are instead used for
+	* backwards compatibility and to better follow JS expectations.
 	*/
-	export interface Row {
-		get(column:Column):any;
-		getFormat(column:Column):Format;
-		get index():LongWrapper;
+	export interface WidgetMessageDetails {
+		/**
+		* Returns the data from this message as a base64-encoded string.
+		*/
+		getDataAsBase64():string;
+		/**
+		* Returns the data from this message as a Uint8Array.
+		*/
+		getDataAsU8():Uint8Array;
+		/**
+		* Returns the data from this message as a utf-8 string.
+		*/
+		getDataAsString():string;
+		/**
+		* Returns an array of exported objects sent from the server. The plugin implementation is now responsible for these
+		* objects, and should close them when no longer needed.
+		*/
+		get exportedObjects():WidgetExportedObject[];
 	}
 	/**
 	* Row implementation that also provides additional read-only properties. represents visible rows in the table, but
@@ -759,149 +761,458 @@ export namespace dh {
 		get hasChildren():boolean;
 		get index():LongWrapper;
 	}
+	export interface ColumnGroup {
+		get name():string|null;
+		get children():string[]|null;
+		get color():string|null;
+	}
 	/**
-	* Options for requesting a preview of columns when requesting table data. The two properties
-	* {@link dh.convertArrayToString} and {@link dh.array} are mutually exclusive.
+	* Simple range consisting only of start and end numbers. Will be migrated to deephaven-core in the near future, and
+	* subsequently removed from this the coreplus namespace.
 	*/
-	export interface PreviewOptions {
-		/**
-		* If true, any array columns will be converted to strings for preview purposes. This is the legacy behavior.
-		*/
-		convertArrayToString?:boolean|null;
+	export interface SimpleRange {
+		first:number;
+		last:number;
+	}
+	export interface LayoutHints {
+		readonly searchDisplayMode?:SearchDisplayModeType|null;
+
+		get hiddenColumns():string[]|null;
+		get frozenColumns():string[]|null;
+		get columnGroups():ColumnGroup[]|null;
+		get areSavedLayoutsAllowed():boolean;
+		get frontColumns():string[]|null;
+		get backColumns():string[]|null;
+	}
+	export interface WorkerHeapInfo {
 		/**
-		* Specifies the length of the array to serialize. If the array is longer than this length, one extra element
-		* will be included - the client is expected to truncate the array and append "..." to indicate that there are
-		* additional elements. Negative values indicate that the values should be counted from the end of the array
-		* rather than the beginning. Zero or null indicate that the entire array should be serialized. The default is
-		* null.
+		* Total heap size available for this worker.
 		*/
-		array?:number|null;
+		get totalHeapSize():number;
+		get freeMemory():number;
+		get maximumHeapSize():number;
 	}
+
 	/**
-	* Options for requesting a snapshot of a table.
+	* A Widget represents a server side object that sends one or more responses to the client. The client can then
+	* interpret these responses to see what to render, or how to respond.
+	* <p>
+	* Most custom object types result in a single response being sent to the client, often with other exported objects, but
+	* some will have streamed responses, and allow the client to send follow-up requests of its own. This class's API is
+	* backwards compatible, but as such does not offer a way to tell the difference between a streaming or non-streaming
+	* object type, the client code that handles the payloads is expected to know what to expect. See
+	* {@link dh.WidgetMessageDetails} for more information.
+	* <p>
+	* When the promise that returns this object resolves, it will have the first response assigned to its fields. Later
+	* responses from the server will be emitted as "message" events. When the connection with the server ends, the "close"
+	* event will be emitted. In this way, the connection will behave roughly in the same way as a WebSocket - either side
+	* can close, and after close no more messages will be processed. There can be some latency in closing locally while
+	* remote messages are still pending - it is up to implementations of plugins to handle this case.
+	* <p>
+	* Also like WebSockets, the plugin API doesn't define how to serialize messages, and just handles any binary payloads.
+	* What it does handle however, is allowing those messages to include references to server-side objects with those
+	* payloads. Those server side objects might be tables or other built-in types in the Deephaven JS API, or could be
+	* objects usable through their own plugins. They also might have no plugin at all, allowing the client to hold a
+	* reference to them and pass them back to the server, either to the current plugin instance, or through another API.
+	* The `Widget` type does not specify how those objects should be used or their lifecycle, but leaves that
+	* entirely to the plugin. Messages will arrive in the order they were sent.
+	* <p>
+	* This can suggest several patterns for how plugins operate:
+	* <ul>
+	* <li>The plugin merely exists to transport some other object to the client. This can be useful for objects which can
+	* easily be translated to some other type (like a Table) when the user clicks on it. An example of this is
+	* `pandas.DataFrame` will result in a widget that only contains a static
+	* {@link dh.Table}. Presently, the widget is immediately closed, and only the Table is
+	* provided to the JS API consumer.</li>
+	* <li>The plugin provides references to Tables and other objects, and those objects can live longer than the object
+	* which provided them. One concrete example of this could have been
+	* {@link dh.PartitionedTable} when fetching constituent tables, but it was implemented
+	* before bidirectional plugins were implemented. Another example of this is plugins that serve as a "factory", giving
+	* the user access to table manipulation/creation methods not supported by gRPC or the JS API.</li>
+	* <li>The plugin provides reference to Tables and other objects that only make sense within the context of the widget
+	* instance, so when the widget goes away, those objects should be released as well. This is also an example of
+	* {@link dh.PartitionedTable}, as the partitioned table tracks creation of new keys through
+	* an internal table instance.</li>
+	* </ul>
+	*
+	* Handling server objects in messages also has more than one potential pattern that can be used:
+	* <ul>
+	* <li>One object per message - the message clearly is about that object, no other details required.</li>
+	* <li>Objects indexed within their message - as each message comes with a list of objects, those objects can be
+	* referenced within the payload by index. This is roughly how {@link dh.plot.Figure}
+	* behaves, where the figure descriptor schema includes an index for each created series, describing which table should
+	* be used, which columns should be mapped to each axis.</li>
+	* <li>Objects indexed since widget creation - each message would append its objects to a list created when the widget
+	* was first made, and any new exports that arrive in a new message would be appended to that list. Then, subsequent
+	* messages can reference objects already sent. This imposes a limitation where the client cannot release any exports
+	* without the server somehow signaling that it will never reference that export again.</li>
+	* </ul>
 	*/
-	export interface SnapshotOptions extends DataOptions {
+	export class Widget implements WidgetMessageDetails, HasEventHandling {
+		static readonly EVENT_MESSAGE:string;
+		static readonly EVENT_CLOSE:string;
+
+		protected constructor();
+
 		/**
-		* If true, the snapshot will be filled starting from the end of the table, where 0 is the last row of the
-		* table. Default is false.
+		* Ends the client connection to the server.
 		*/
-		isReverseViewport?:boolean|null;
+		close():void;
+		getDataAsBase64():string;
+		getDataAsU8():Uint8Array;
+		getDataAsString():string;
 		/**
-		* The rows to include in the snapshot. This can be either a {@link dh.RangeSet} or a single range with
-		* `first` and `last` properties.
+		* Sends a string/bytes payload to the server, along with references to objects that exist on the server.
+		* @param msg - string/buffer/view instance that represents data to send
+		* @param references - an array of objects that can be safely sent to the server
 		*/
-		rows:RangeSet|SimpleRange;
+		sendMessage(msg:string|ArrayBuffer|ArrayBufferView, references?:Array<Table|Widget|WidgetExportedObject|PartitionedTable|TotalsTable|TreeTable>):void;
+		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
+		hasListeners(name:string):boolean;
+		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
+		/**
+		* 
+		* @return the exported objects sent in the initial message from the server. The client is responsible for closing
+		*         them when finished using them.
+		*/
+		get exportedObjects():WidgetExportedObject[];
+		/**
+		* 
+		* @return the type of this widget
+		*/
+		get type():string;
 	}
 
+
 	/**
-	* Provides access to data in a table. Note that several methods present their response through Promises. This allows
-	* the client to both avoid actually connecting to the server until necessary, and also will permit some changes not to
-	* inform the UI right away that they have taken place.
+	* Describes how a Totals Table will be generated from its parent table. Each table has a default (which may be null)
+	* indicating how that table was configured when it was declared, and each Totals Table has a similar property
+	* describing how it was created. Both the <b>Table.getTotalsTable</b> and <b>Table.getGrandTotalsTable</b> methods take
+	* this config as an optional parameter - without it, the table's default will be used, or if null, a default instance
+	* of <b>TotalsTableConfig</b> will be supplied.
+	*
+	* This class has a no-arg constructor, allowing an instance to be made with the default values provided. However, any
+	* JS object can be passed in to the methods which accept instances of this type, provided their values adhere to the
+	* expected formats.
 	*/
-	export class Table implements JoinableTable, HasEventHandling {
-		readonly description?:string|null;
-		readonly pluginName?:string|null;
-		readonly layoutHints?:null|LayoutHints;
+	export class TotalsTableConfig {
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_SIZECHANGED:string;
+		static readonly COUNT:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_UPDATED:string;
+		static readonly MIN:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_ROWADDED:string;
+		static readonly MAX:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_ROWREMOVED:string;
+		static readonly SUM:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_ROWUPDATED:string;
+		static readonly ABS_SUM:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_SORTCHANGED:string;
+		static readonly VAR:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_FILTERCHANGED:string;
+		static readonly AVG:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_CUSTOMCOLUMNSCHANGED:string;
+		static readonly STD:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_DISCONNECT:string;
+		static readonly FIRST:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_RECONNECT:string;
+		static readonly LAST:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* @deprecated
 		*/
-		static readonly EVENT_RECONNECTFAILED:string;
+		static readonly SKIP:string;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* Specifies if a Totals Table should be expanded by default in the UI. Defaults to false.
 		*/
-		static readonly EVENT_REQUEST_FAILED:string;
+		showTotalsByDefault:boolean;
 		/**
-		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		* Specifies if a Grand Totals Table should be expanded by default in the UI. Defaults to false.
 		*/
-		static readonly EVENT_REQUEST_SUCCEEDED:string;
+		showGrandTotalsByDefault:boolean;
 		/**
-		* The size the table will have if it is uncoalesced.
+		* Specifies the default operation for columns that do not have a specific operation applied; defaults to "Sum".
 		*/
-		static readonly SIZE_UNCOALESCED:number;
-
-		protected constructor();
-
-		batch(userCode:(arg0:unknown)=>void):Promise<Table>;
+		defaultOperation:AggregationOperationType;
 		/**
-		* Retrieve a column by the given name. You should prefer to always retrieve a new Column instance instead of
-		* caching a returned value.
-		* @param key - 
-		* @return {@link dh.Column}
+		* Mapping from each column name to the aggregation(s) that should be applied to that column in the resulting Totals
+		* Table. If a column is omitted, the defaultOperation is used.
 		*/
-		findColumn(key:string):Column;
+		operationMap:{ [key: string]: Array<AggregationOperationType>; };
 		/**
-		* Retrieve multiple columns specified by the given names.
-		* @param keys - 
-		* @return {@link dh.Column} array
+		* Groupings to use when generating the Totals Table. One row will exist for each unique set of values observed in
+		* these columns. See also `Table.selectDistinct`.
 		*/
-		findColumns(keys:string[]):Column[];
-		isBlinkTable():boolean;
+		groupBy:Array<string>;
+
+		constructor();
+
+		toString():string;
+	}
+
+	/**
+	* Describes a grouping and aggregations for a roll-up table. Pass to the <b>Table.rollup</b> function to create a
+	* roll-up table.
+	*/
+	export class RollupConfig {
 		/**
-		* If .hasInputTable is true, you may call this method to gain access to an InputTable object which can be used to
-		* mutate the data within the table. If the table is not an Input Table, the promise will be immediately rejected.
-		* @return Promise of dh.InputTable
+		* Ordered list of columns to group by to form the hierarchy of the resulting roll-up table.
 		*/
-		inputTable():Promise<InputTable>;
+		groupingColumns:Array<String>;
 		/**
-		* Indicates that this Table instance will no longer be used, and its connection to the server can be cleaned up.
+		* Mapping from each aggregation name to the ordered list of columns it should be applied to in the resulting
+		* roll-up table.
 		*/
-		close():void;
-		getAttributes():string[];
+		aggregations:{ [key: string]: Array<string>; };
 		/**
-		* null if no property exists, a string if it is an easily serializable property, or a ```Promise
-		* &lt;Table&gt;``` that will either resolve with a table or error out if the object can't be passed to JS.
-		* @param attributeName - 
-		* @return Object
+		* Optional parameter indicating if an extra leaf node should be added at the bottom of the hierarchy, showing the
+		* rows in the underlying table which make up that grouping. Since these values might be a different type from the
+		* rest of the column, any client code must check if TreeRow.hasChildren = false, and if so, interpret those values
+		* as if they were Column.constituentType instead of Column.type. Defaults to false.
 		*/
-		getAttribute(attributeName:string):unknown|undefined|null;
+		includeConstituents:boolean;
+		includeOriginalColumns?:boolean|null;
 		/**
-		* Replace the currently set sort on this table. Returns the previously set value. Note that the sort property will
-		* immediately return the new value, but you may receive update events using the old sort before the new sort is
-		* applied, and the <b>sortchanged</b> event fires. Reusing existing, applied sorts may enable this to perform
-		* better on the server. The <b>updated</b> event will also fire, but <b>rowadded</b> and <b>rowremoved</b> will
-		* not.
-		* @param sort - 
-		* @return {@link dh.Sort} array
+		* Optional parameter indicating if original column descriptions should be included. Defaults to true.
+		*/
+		includeDescriptions:boolean;
+
+		constructor();
+	}
+
+	/**
+	* Event fired when a command is issued from the client.
+	*/
+	export class CommandInfo {
+		constructor(code:string, result:Promise<dh.ide.CommandResult>);
+
+		get result():Promise<dh.ide.CommandResult>;
+		get code():string;
+	}
+
+	export class LoginCredentials {
+		type?:string|null;
+		username?:string|null;
+		token?:string|null;
+
+		constructor();
+	}
+
+	/**
+	* A js type for operating on input tables.
+	*
+	* Represents a User Input Table, which can have data added to it from other sources.
+	*
+	* You may add rows using dictionaries of key-value tuples (representing columns by name), add tables containing all the
+	* key/value columns to add, or delete tables containing the keys to delete. Each operation is atomic, and will either
+	* succeed completely or fail completely. To guarantee order of operations, apply an operation and wait for the response
+	* before sending the next operation.
+	*
+	* Each table has one or more key columns, where each unique combination of keys will appear at most once in the table.
+	*
+	* To view the results of the Input Table, you should use standard table operations on the InputTable's source Table
+	* object.
+	*/
+	export class InputTable {
+		protected constructor();
+
+		/**
+		* Adds a single row to the table. For each key or value column name in the Input Table, we retrieve that javascript
+		* property at that name and validate it can be put into the given column type.
+		* @param row - 
+		* @param userTimeZone - 
+		* @return Promise of dh.InputTable
+		*/
+		addRow(row:{ [key: string]: any; }, userTimeZone?:string):Promise<InputTable>;
+		/**
+		* Add multiple rows to a table.
+		* @param rows - 
+		* @param userTimeZone - 
+		* @return Promise of dh.InputTable
+		*/
+		addRows(rows:{ [key: string]: any; }[], userTimeZone?:string):Promise<InputTable>;
+		/**
+		* Add an entire table to this Input Table. Only column names that match the definition of the input table will be
+		* copied, and all key columns must have values filled in. This only copies the current state of the source table;
+		* future updates to the source table will not be reflected in the Input Table. The returned promise will be
+		* resolved to the same InputTable instance this method was called upon once the server returns.
+		* @param tableToAdd - 
+		* @return Promise of dh.InputTable
+		*/
+		addTable(tableToAdd:Table):Promise<InputTable>;
+		/**
+		* Add multiple tables to this Input Table.
+		* @param tablesToAdd - 
+		* @return Promise of dh.InputTable
+		*/
+		addTables(tablesToAdd:Table[]):Promise<InputTable>;
+		/**
+		* Deletes an entire table from this Input Table. Key columns must match the Input Table.
+		* @param tableToDelete - 
+		* @return Promise of dh.InputTable
+		*/
+		deleteTable(tableToDelete:Table):Promise<InputTable>;
+		/**
+		* Delete multiple tables from this Input Table.
+		* @param tablesToDelete - 
+		* @return 
+		*/
+		deleteTables(tablesToDelete:Table[]):Promise<InputTable>;
+		/**
+		* A list of the key columns, by name
+		* @return String array.
+		*/
+		get keys():string[];
+		/**
+		* A list of the value columns, by name
+		* @return String array.
+		*/
+		get values():string[];
+		/**
+		* A list of the key columns.
+		* @return Column array.
+		*/
+		get keyColumns():Column[];
+		/**
+		* A list of the value Column objects
+		* @return {@link dh.Column} array.
+		*/
+		get valueColumns():Column[];
+		/**
+		* The source table for this Input Table
+		* @return dh.table
+		*/
+		get table():Table;
+	}
+
+	/**
+	* Provides access to data in a table. Note that several methods present their response through Promises. This allows
+	* the client to both avoid actually connecting to the server until necessary, and also will permit some changes not to
+	* inform the UI right away that they have taken place.
+	*/
+	export class Table implements JoinableTable, HasEventHandling {
+		readonly description?:string|null;
+		readonly pluginName?:string|null;
+		readonly layoutHints?:null|LayoutHints;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_SIZECHANGED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_UPDATED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_ROWADDED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_ROWREMOVED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_ROWUPDATED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_SORTCHANGED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_FILTERCHANGED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_CUSTOMCOLUMNSCHANGED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_DISCONNECT:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_RECONNECT:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_RECONNECTFAILED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_REQUEST_FAILED:string;
+		/**
+		* The table size has updated, so live scrollbars and the like can be updated accordingly.
+		*/
+		static readonly EVENT_REQUEST_SUCCEEDED:string;
+		/**
+		* The size the table will have if it is uncoalesced.
+		*/
+		static readonly SIZE_UNCOALESCED:number;
+
+		protected constructor();
+
+		batch(userCode:(arg0:unknown)=>void):Promise<Table>;
+		/**
+		* Retrieve a column by the given name. You should prefer to always retrieve a new Column instance instead of
+		* caching a returned value.
+		* @param key - 
+		* @return {@link dh.Column}
+		*/
+		findColumn(key:string):Column;
+		/**
+		* Retrieve multiple columns specified by the given names.
+		* @param keys - 
+		* @return {@link dh.Column} array
+		*/
+		findColumns(keys:string[]):Column[];
+		isBlinkTable():boolean;
+		/**
+		* If .hasInputTable is true, you may call this method to gain access to an InputTable object which can be used to
+		* mutate the data within the table. If the table is not an Input Table, the promise will be immediately rejected.
+		* @return Promise of dh.InputTable
+		*/
+		inputTable():Promise<InputTable>;
+		/**
+		* Indicates that this Table instance will no longer be used, and its connection to the server can be cleaned up.
+		*/
+		close():void;
+		getAttributes():string[];
+		/**
+		* null if no property exists, a string if it is an easily serializable property, or a ```Promise
+		* &lt;Table&gt;``` that will either resolve with a table or error out if the object can't be passed to JS.
+		* @param attributeName - 
+		* @return Object
+		*/
+		getAttribute(attributeName:string):unknown|undefined|null;
+		/**
+		* Replace the currently set sort on this table. Returns the previously set value. Note that the sort property will
+		* immediately return the new value, but you may receive update events using the old sort before the new sort is
+		* applied, and the <b>sortchanged</b> event fires. Reusing existing, applied sorts may enable this to perform
+		* better on the server. The <b>updated</b> event will also fire, but <b>rowadded</b> and <b>rowremoved</b> will
+		* not.
+		* @param sort - 
+		* @return {@link dh.Sort} array
 		*/
 		applySort(sort:Sort[]):Array<Sort>;
 		/**
@@ -1179,85 +1490,39 @@ export namespace dh {
 		static reverse():Sort;
 	}
 
-
 	/**
-	* This class allows iteration over non-contiguous indexes. In the future, this will support the EcmaScript 2015
-	* Iteration protocol, but for now has one method which returns an iterator, and also supports querying the size.
-	* Additionally, we may add support for creating RangeSet objects to better serve some use cases.
+	* Represents a non-viewport subscription to a table, and all data currently known to be present in the subscribed
+	* columns. This class handles incoming snapshots and deltas, and fires events to consumers to notify of data changes.
+	* <p>
+	* Unlike {@link dh.TableViewportSubscription}, the "original" table does not have a reference to this instance, only the
+	* "private" table instance does, since the original cannot modify the subscription, and the private instance must
+	* forward data to it.
+	* <p>
+	* Represents a subscription to the table on the server. Changes made to the table will not be reflected here - the
+	* subscription must be closed and a new one optioned to see those changes. The event model is slightly different from
+	* viewports to make it less expensive to compute for large tables.
 	*/
-	export class RangeSet {
+	export class TableSubscription implements HasEventHandling {
 		protected constructor();
 
-		static ofRange(first:number, last:number):RangeSet;
-		static ofItems(rows:number[]):RangeSet;
-		static ofRanges(ranges:RangeSet[]):RangeSet;
-		static ofSortedRanges(ranges:RangeSet[]):RangeSet;
+		static createTableSubscription(options:SubscriptionOptions, existingTable:Table):TableSubscription;
 		/**
-		* a new iterator over all indexes in this collection.
-		* @return Iterator of {@link dh.LongWrapper}
+		* Updates the subscription to use the given columns and update interval.
+		* @param columns - the new columns to subscribe to
+		* @param updateIntervalMs - the new update interval, or null/omit to use the default of one second
 		*/
-		iterator():Iterator<LongWrapper>;
+		changeSubscription(columns:Array<Column>, updateIntervalMs:number|undefined|null):void;
 		/**
-		* The total count of items contained in this collection. In some cases this can be expensive to compute, and
-		* generally should not be needed except for debugging purposes, or preallocating space (i.e., do not call this
-		* property each time through a loop).
-		* @return double
+		* Update the options for this viewport subscription. This cannot alter the update interval or preview options.
+		* @param options - the subscription options
 		*/
-		get size():number;
-	}
-
-	/**
-	* Wrap BigInteger values for use in JS. Provides text formatting for display and access to the underlying value.
-	*/
-	export class BigIntegerWrapper {
-		protected constructor();
-
-		static ofString(str:string):BigIntegerWrapper;
-		asNumber():number;
-		valueOf():string;
-		toString():string;
-		equals(o:object):boolean;
-		hashCode():number;
-	}
-
-	/**
-	* This object serves as a "handle" to a subscription, allowing it to be acted on directly or canceled outright. If you
-	* retain an instance of this, you have two choices - either only use it to call `close()` on it to stop the table's
-	* viewport without creating a new one, or listen directly to this object instead of the table for data events, and
-	* always call `close()` when finished. Calling any method on this object other than close() will result in it
-	* continuing to live on after `setViewport` is called on the original table, or after the table is modified.
-	*/
-	export class TableViewportSubscription implements HasEventHandling {
-		protected constructor();
-
-		/**
-		* Changes the rows and columns set on this viewport. This cannot be used to change the update interval.
-		* @param firstRow - 
-		* @param lastRow - 
-		* @param columns - 
-		* @param updateIntervalMs - 
-		* @deprecated use {@link #update(Object)} instead
-		*/
-		setViewport(firstRow:number, lastRow:number, columns?:Column[]|undefined|null, updateIntervalMs?:number|undefined|null, isReverseViewport?:boolean|undefined|null):void;
-		/**
-		* Update the options for this viewport subscription. This cannot alter the update interval or preview options.
-		* @param options - the subscription options
-		*/
-		update(options:ViewportSubscriptionOptions):void;
+		update(options:SubscriptionOptions):void;
+		get columns():Array<Column>;
 		/**
-		* Stops this viewport from running, stopping all events on itself and on the table that created it.
+		* Stops the subscription on the server.
 		*/
 		close():void;
 		/**
-		* Gets the data currently visible in this viewport
-		* @return Promise of {@link dh.TableData}.
-		*/
-		getViewportData():Promise<ViewportData>;
-		/**
-		* @deprecated
-		*/
-		snapshot(rows:RangeSet, columns:Column[]):Promise<TableData>;
-		/**
 		* Listen for events on this object.
 		* @param name - the name of the event to listen for
 		* @param callback - a function to call when the event occurs
@@ -1278,126 +1543,125 @@ export namespace dh {
 	}
 
 	/**
-	* Describes the structure of the column, and if desired can be used to get access to the data to be rendered in this
-	* column.
+	* Options for custom columns.
 	*/
-	export class Column {
+	export class CustomColumnOptions {
 		/**
-		* If this column is part of a roll-up tree table, represents the type of the row data that can be found in this
-		* column for leaf nodes if includeConstituents is enabled. Otherwise, it is <b>null</b>.
-		* @return String
+		* When specified for custom columns on a rollup table, specifies if the formula apply to rollup or constituent
+		* nodes.
 		*/
-		readonly constituentType?:string|null;
-		readonly description?:string|null;
+		rollupNodeType?:RollupNodeTypeType|null;
+
+		constructor();
+	}
 
+	/**
+	* This class allows iteration over non-contiguous indexes. In the future, this will support the EcmaScript 2015
+	* Iteration protocol, but for now has one method which returns an iterator, and also supports querying the size.
+	* Additionally, we may add support for creating RangeSet objects to better serve some use cases.
+	*/
+	export class RangeSet {
 		protected constructor();
 
+		static ofRange(first:number, last:number):RangeSet;
+		static ofItems(rows:number[]):RangeSet;
+		static ofRanges(ranges:RangeSet[]):RangeSet;
+		static ofSortedRanges(ranges:RangeSet[]):RangeSet;
 		/**
-		* the value for this column in the given row. Type will be consistent with the type of the Column.
-		* @param row - 
-		* @return Any
+		* a new iterator over all indexes in this collection.
+		* @return Iterator of {@link dh.LongWrapper}
 		*/
-		get(row:Row):any;
-		getFormat(row:Row):Format;
+		iterator():Iterator<LongWrapper>;
 		/**
-		* Creates a sort builder object, to be used when sorting by this column.
-		* @return {@link dh.Sort}
+		* The total count of items contained in this collection. In some cases this can be expensive to compute, and
+		* generally should not be needed except for debugging purposes, or preallocating space (i.e., do not call this
+		* property each time through a loop).
+		* @return double
 		*/
-		sort():Sort;
+		get size():number;
+	}
+
+	/**
+	* Describes a filter which can be applied to a table. Replacing these instances may be more expensive than reusing
+	* them. These instances are immutable - all operations that compose them to build bigger expressions return a new
+	* instance.
+	*/
+	export class FilterCondition {
+		protected constructor();
+
 		/**
-		* Creates a new value for use in filters based on this column. Used either as a parameter to another filter
-		* operation, or as a builder to create a filter operation.
-		* @return {@link dh.FilterValue}
+		* the opposite of this condition
+		* @return FilterCondition
 		*/
-		filter():FilterValue;
+		not():FilterCondition;
 		/**
-		* a <b>CustomColumn</b> object to apply using `applyCustomColumns` with the expression specified.
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* a condition representing the current condition logically ANDed with the other parameters
+		* @param filters - 
+		* @return FilterCondition
 		*/
-		formatColor(expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
+		and(...filters:FilterCondition[]):FilterCondition;
 		/**
-		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* a condition representing the current condition logically ORed with the other parameters
+		* @param filters - 
+		* @return FilterCondition.
 		*/
-		formatNumber(expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
+		or(...filters:FilterCondition[]):FilterCondition;
 		/**
-		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* a string suitable for debugging showing the details of this condition.
+		* @return String.
 		*/
-		formatDate(expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
 		toString():string;
+		get columns():Array<Column>;
 		/**
-		* Label for this column.
-		* @return String
-		*/
-		get name():string;
-		/**
-		* True if this column is a partition column. Partition columns are used for filtering uncoalesced tables - see
-		* {@link Table.uncoalesced}.
-		* @return true if the column is a partition column
-		*/
-		get isPartitionColumn():boolean;
-		/**
-		* 
-		* @deprecated do not use. Internal index of the column in the table, to be used as a key on the Row.
-		* @return int
-		*/
-		get index():number;
-		get isSortable():boolean;
-		/**
-		* Type of the row data that can be found in this column.
-		* @return String
-		*/
-		get type():string;
-		/**
-		* Format entire rows colors using the expression specified. Returns a <b>CustomColumn</b> object to apply to a
-		* table using <b>applyCustomColumns</b> with the parameters specified.
-		* @param expression - 
-		* @param options - 
-		* @return {@link dh.CustomColumn}
+		* a filter condition invoking a static function with the given parameters. Currently supported Deephaven static
+		* functions:
+		* <ul>
+		* <li><b>inRange</b>: Given three comparable values, returns true if the first is less than the second but greater
+		* than the third</li>
+		* <li><b>isInf</b>:Returns true if the given number is <i>infinity</i></li>
+		* <li><b>isNaN</b>:Returns true if the given number is <i>not a number</i></li>
+		* <li><b>isNormal</b>:Returns true if the given number <i>is not null</i>, <i>is not infinity</i>, and <i>is not
+		* "not a number"</i></li>
+		* <li><b>startsWith</b>:Returns true if the first string starts with the second string</li>
+		* <li><b>endsWith</b>Returns true if the first string ends with the second string</li>
+		* <li><b>matches</b>:Returns true if the first string argument matches the second string used as a Java regular
+		* expression</li>
+		* <li><b>contains</b>:Returns true if the first string argument contains the second string as a substring</li>
+		* <li><b>in</b>:Returns true if the first string argument can be found in the second array argument.
+		* <p>
+		* Note that the array can only be specified as a column reference at this time - typically the `FilterValue.in`
+		* method should be used in other cases
+		* </p>
+		* </li>
+		* </ul>
+		* @param function - 
+		* @param args - 
+		* @return dh.FilterCondition
 		*/
-		static formatRowColor(expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
+		static invoke(func:string, ...args:FilterValue[]):FilterCondition;
 		/**
-		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
-		* @param name - 
-		* @param expression - 
-		* @param options - 
-		* @return {@link dh.CustomColumn}
+		* a filter condition which will check if the given value can be found in any supported column on whatever table
+		* this FilterCondition is passed to. This FilterCondition is somewhat unique in that it need not be given a column
+		* instance, but will adapt to any table. On numeric columns, with a value passed in which can be parsed as a
+		* number, the column will be filtered to numbers which equal, or can be "rounded" effectively to this number. On
+		* String columns, the given value will match any column which contains this string in a case-insensitive search. An
+		* optional second argument can be passed, an array of `FilterValue` from the columns to limit this search to (see
+		* {@link dh.Column.filter}).
+		* @param value - 
+		* @param columns - 
+		* @return dh.FilterCondition
 		*/
-		static createCustomColumn(name:string, expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
+		static search(value:FilterValue, columns?:FilterValue[]):FilterCondition;
 	}
 
 	/**
-	* Addition optional configuration that can be passed to the {@link dh.CoreClient} constructor.
+	* Deprecated for use in Deephaven Core.
+	* @deprecated
 	*/
-	export class ConnectOptions {
-		/**
-		* Optional map of http header names and values to send to the server with each request.
-		*/
-		headers?:{ [key: string]: string; }|null;
-		/**
-		* True to enable debug logging. At this time, only enables logging for gRPC calls.
-		*/
-		debug?:boolean|null;
-		/**
-		* Set this to true to force the use of websockets when connecting to the deephaven instance, false to force the use
-		* of `fetch`. Ignored if {@link dh.transportFactory} is set.
-		* <p>
-		* Defaults to null, indicating that the server URL should be checked to see if we connect with fetch or websockets.
-		*/
-		useWebsockets?:boolean|null;
-		/**
-		* The transport factory to use for creating gRPC streams. If specified, the JS API will ignore
-		* {@link dh.useWebsockets} and its own internal logic for determining the appropriate transport to use.
-		* <p>
-		* Defaults to null, indicating that the JS API should determine the appropriate transport to use. If
-		* `useWebsockets` is set to true, the JS API will use websockets, otherwise if the server url begins with
-		* https, it will use fetch, otherwise it will use websockets.
-		*/
-		transportFactory?:dh.grpc.GrpcTransportFactory|null;
+	export class Client {
+		static readonly EVENT_REQUEST_FAILED:string;
+		static readonly EVENT_REQUEST_STARTED:string;
+		static readonly EVENT_REQUEST_SUCCEEDED:string;
 
 		constructor();
 	}
@@ -1411,15 +1675,6 @@ export namespace dh {
 		protected constructor();
 	}
 
-	export class LongWrapper {
-		protected constructor();
-
-		static ofString(str:string):LongWrapper;
-		asNumber():number;
-		valueOf():string;
-		toString():string;
-	}
-
 	/**
 	* Presently, this is the entrypoint into the Deephaven JS API. By creating an instance of this with the server URL and
 	* some options, JS applications can run code on the server, and interact with available exportable objects.
@@ -1519,14 +1774,107 @@ export namespace dh {
 	}
 
 	/**
-	* Represents a set of Tables each corresponding to some key. The keys are available locally, but a call must be made to
-	* the server to get each Table. All tables will have the same structure.
+	* Describes the structure of the column, and if desired can be used to get access to the data to be rendered in this
+	* column.
 	*/
-	export class PartitionedTable implements HasEventHandling {
+	export class Column {
 		/**
-		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
-		*/
-		static readonly EVENT_KEYADDED:string;
+		* If this column is part of a roll-up tree table, represents the type of the row data that can be found in this
+		* column for leaf nodes if includeConstituents is enabled. Otherwise, it is <b>null</b>.
+		* @return String
+		*/
+		readonly constituentType?:string|null;
+		readonly description?:string|null;
+
+		protected constructor();
+
+		/**
+		* the value for this column in the given row. Type will be consistent with the type of the Column.
+		* @param row - 
+		* @return Any
+		*/
+		get(row:Row):any;
+		getFormat(row:Row):Format;
+		/**
+		* Creates a sort builder object, to be used when sorting by this column.
+		* @return {@link dh.Sort}
+		*/
+		sort():Sort;
+		/**
+		* Creates a new value for use in filters based on this column. Used either as a parameter to another filter
+		* operation, or as a builder to create a filter operation.
+		* @return {@link dh.FilterValue}
+		*/
+		filter():FilterValue;
+		/**
+		* a <b>CustomColumn</b> object to apply using `applyCustomColumns` with the expression specified.
+		* @param expression - 
+		* @return {@link dh.CustomColumn}
+		*/
+		formatColor(expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
+		/**
+		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
+		* @param expression - 
+		* @return {@link dh.CustomColumn}
+		*/
+		formatNumber(expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
+		/**
+		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
+		* @param expression - 
+		* @return {@link dh.CustomColumn}
+		*/
+		formatDate(expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
+		toString():string;
+		/**
+		* Label for this column.
+		* @return String
+		*/
+		get name():string;
+		/**
+		* True if this column is a partition column. Partition columns are used for filtering uncoalesced tables - see
+		* {@link Table.uncoalesced}.
+		* @return true if the column is a partition column
+		*/
+		get isPartitionColumn():boolean;
+		/**
+		* 
+		* @deprecated do not use. Internal index of the column in the table, to be used as a key on the Row.
+		* @return int
+		*/
+		get index():number;
+		get isSortable():boolean;
+		/**
+		* Type of the row data that can be found in this column.
+		* @return String
+		*/
+		get type():string;
+		/**
+		* Format entire rows colors using the expression specified. Returns a <b>CustomColumn</b> object to apply to a
+		* table using <b>applyCustomColumns</b> with the parameters specified.
+		* @param expression - 
+		* @param options - 
+		* @return {@link dh.CustomColumn}
+		*/
+		static formatRowColor(expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
+		/**
+		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
+		* @param name - 
+		* @param expression - 
+		* @param options - 
+		* @return {@link dh.CustomColumn}
+		*/
+		static createCustomColumn(name:string, expression:string, options?:CustomColumnOptions|undefined|null):CustomColumn;
+	}
+
+	/**
+	* Represents a set of Tables each corresponding to some key. The keys are available locally, but a call must be made to
+	* the server to get each Table. All tables will have the same structure.
+	*/
+	export class PartitionedTable implements HasEventHandling {
+		/**
+		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
+		*/
+		static readonly EVENT_KEYADDED:string;
 		/**
 		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
 		*/
@@ -1612,318 +1960,111 @@ export namespace dh {
 		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
 	}
 
-	export class DateWrapper extends LongWrapper {
-		protected constructor();
-
-		static ofJsDate(date:Date):DateWrapper;
-		asDate():Date;
-	}
-
 	/**
-	* Configuration object for running Table.treeTable to produce a hierarchical view of a given "flat" table.
-	*
-	* Like TotalsTableConfig, `TreeTableConfig` supports an operation map indicating how to aggregate the data, as well as
-	* an array of column names which will be the layers in the roll-up tree, grouped at each level. An additional optional
-	* value can be provided describing the strategy the engine should use when grouping the rows.
+	* Behaves like a {@link dh.Table} externally, but data, state, and viewports are managed by an entirely different
+	* mechanism, and so reimplemented here.
+	* <p>
+	* Any time a change is made, we build a new request and send it to the server, and wait for the updated state.
+	* <p>
+	* Semantics around getting updates from the server are slightly different - we don't "unset" the viewport here after
+	* operations are performed, but encourage the client code to re-set them to the desired position.
+	* <p>
+	* The table size will be -1 until a viewport has been fetched.
+	* <p>
+	* Similar to a table, a Tree Table provides access to subscribed viewport data on the current hierarchy. A different
+	* Row type is used within that viewport, showing the depth of that node within the tree and indicating details about
+	* whether it has children or is expanded. The Tree Table itself then provides the ability to change if a row is
+	* expanded or not. Methods used to control or check if a row should be expanded or not can be invoked on a TreeRow
+	* instance, or on the number of the row (thus allowing for expanding/collapsing rows which are not currently visible in
+	* the viewport).
+	* <p>
+	* Events and viewports are somewhat different from tables, due to the expense of computing the expanded/collapsed rows
+	* and count of children at each level of the hierarchy, and differences in the data that is available.
+	* <p>
+	* <ul>
+	* <li>There is no {@link Table.totalSize | totalSize} property.</li>
+	* <li>The viewport is not un-set when changes are made to filter or sort, but changes will continue to be streamed in.
+	* It is suggested that the viewport be changed to the desired position (usually the first N rows) after any filter/sort
+	* change is made. Likewise, {@link getViewportData} will always return the most recent data, and will not wait if a
+	* new operation is pending.</li>
+	* <li>Custom columns are supported on Rollup tables, but not on Tree tables. If the TreeTable was created client-side,
+	* the original Table can have custom columns applied, and the TreeTable can be recreated.</li>
+	* <li>Whereas Table has a {@link Table.totalsTableConfig} property, it is defined here as a method,
+	* {@link getTotalsTableConfig}. This returns a promise so the config can be fetched asynchronously.</li>
+	* <li>Totals Tables for trees vary in behavior between tree tables and roll-up tables. This behavior is based on the
+	* original flat table used to produce the Tree Table - for a hierarchical table (i.e. Table.treeTable in the query
+	* config), the totals will include non-leaf nodes (since they are themselves actual rows in the table), but in a
+	* roll-up table, the totals only include leaf nodes (as non-leaf nodes are generated through grouping the contents of
+	* the original table). Roll-ups also have the {@link dh.includeConstituents} property, indicating that a
+	* {@link dh.Column} in the tree may have a {@link Column.constituentType} property reflecting that the type of cells
+	* where {@link TreeRowImpl.hasChildren} is false will be different from usual.</li>
+	* </ul>
 	*/
-	export class TreeTableConfig {
+	export class TreeTable implements HasEventHandling {
 		/**
-		* The column representing the unique ID for each item
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
 		*/
-		idColumn:string;
+		static readonly EVENT_UPDATED:string;
 		/**
-		* The column representing the parent ID for each item
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
 		*/
-		parentColumn:string;
+		static readonly EVENT_DISCONNECT:string;
 		/**
-		* Optional parameter indicating if items with an invalid parent ID should be promoted to root. Defaults to false.
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
+		*/
+		static readonly EVENT_RECONNECT:string;
+		/**
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
+		*/
+		static readonly EVENT_RECONNECTFAILED:string;
+		/**
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
 		*/
-		promoteOrphansToRoot:boolean;
-
-		constructor();
-	}
-
-	/**
-	* Deprecated for use in Deephaven Core.
-	* @deprecated
-	*/
-	export class Client {
 		static readonly EVENT_REQUEST_FAILED:string;
-		static readonly EVENT_REQUEST_STARTED:string;
-		static readonly EVENT_REQUEST_SUCCEEDED:string;
-
-		constructor();
-	}
-
-	/**
-	* Wrap BigDecimal values for use in JS. Provides text formatting for display and access to the underlying value.
-	*/
-	export class BigDecimalWrapper {
-		protected constructor();
-
-		static ofString(value:string):BigDecimalWrapper;
-		asNumber():number;
-		valueOf():string;
-		toString():string;
-		equals(o:object):boolean;
-		hashCode():number;
-	}
-
-	/**
-	* Describes a Sort present on the table. No visible constructor, created through the use of Column.sort(), will be tied
-	* to that particular column data. Sort instances are immutable, and use a builder pattern to make modifications. All
-	* methods return a new Sort instance.
-	*/
-	export class Sort {
-		static readonly ASCENDING:string;
-		static readonly DESCENDING:string;
-		static readonly REVERSE:string;
+		readonly description?:string|null;
+		readonly layoutHints?:null|LayoutHints;
 
 		protected constructor();
 
 		/**
-		* Builds a Sort instance to sort values in ascending order.
-		* @return {@link dh.Sort}
+		* Expands the given node, so that its children are visible when they are in the viewport. The parameter can be the
+		* row index, or the row object itself. The second parameter is a boolean value, false by default, specifying if the
+		* row and all descendants should be fully expanded. Equivalent to `setExpanded(row, true)` with an optional third
+		* boolean parameter.
+		* @param row - 
+		* @param expandDescendants - 
 		*/
-		asc():Sort;
+		expand(row:TreeRow|number, expandDescendants?:boolean):void;
 		/**
-		* Builds a Sort instance to sort values in descending order.
-		* @return {@link dh.Sort}
+		* Collapses the given node, so that its children and descendants are not visible in the size or the viewport. The
+		* parameter can be the row index, or the row object itself. Equivalent to <b>setExpanded(row, false, false)</b>.
+		* @param row - 
 		*/
-		desc():Sort;
+		collapse(row:TreeRow|number):void;
 		/**
-		* Builds a Sort instance which takes the absolute value before applying order.
-		* @return {@link dh.Sort}
+		* Specifies if the given node should be expanded or collapsed. If this node has children, and the value is changed,
+		* the size of the table will change. If node is to be expanded and the third parameter, <b>expandDescendants</b>,
+		* is true, then its children will also be expanded.
+		* @param row - the row to expand or collapse, either the absolute row index or the row object
+		* @param isExpanded - true to expand the row, false to collapse
+		* @param expandDescendants - true to expand the row and all descendants, false to expand only the row, defaults to
+		*        false
 		*/
-		abs():Sort;
-		toString():string;
+		setExpanded(row:TreeRow|number, isExpanded:boolean, expandDescendants?:boolean):void;
+		expandAll():void;
+		collapseAll():void;
 		/**
-		* True if the absolute value of the column should be used when sorting; defaults to false.
-		* @return boolean
+		* Tests if the specified row is expanded.
+		* @param row - the row to test, either the absolute row index or the row object
+		* @return boolean true if the row is expanded, false otherwise
 		*/
-		get isAbs():boolean;
+		isExpanded(row:TreeRow|number):boolean;
+		setViewport(firstRow:number, lastRow:number, columns?:Array<Column>|undefined|null, updateInterval?:number|undefined|null):void;
+		getViewportData():Promise<TreeViewportData>;
 		/**
-		* The column which is sorted.
-		* @return {@link dh.Column}
+		* Indicates that the table will no longer be used, and server resources can be freed.
 		*/
-		get column():Column;
-		/**
-		* The direction of this sort, either <b>ASC</b>, <b>DESC</b>, or <b>REVERSE</b>.
-		* @return String
-		*/
-		get direction():string;
-	}
-
-	export class LoginCredentials {
-		type?:string|null;
-		username?:string|null;
-		token?:string|null;
-
-		constructor();
-	}
-
-	/**
-	* A js type for operating on input tables.
-	*
-	* Represents a User Input Table, which can have data added to it from other sources.
-	*
-	* You may add rows using dictionaries of key-value tuples (representing columns by name), add tables containing all the
-	* key/value columns to add, or delete tables containing the keys to delete. Each operation is atomic, and will either
-	* succeed completely or fail completely. To guarantee order of operations, apply an operation and wait for the response
-	* before sending the next operation.
-	*
-	* Each table has one or more key columns, where each unique combination of keys will appear at most once in the table.
-	*
-	* To view the results of the Input Table, you should use standard table operations on the InputTable's source Table
-	* object.
-	*/
-	export class InputTable {
-		protected constructor();
-
-		/**
-		* Adds a single row to the table. For each key or value column name in the Input Table, we retrieve that javascript
-		* property at that name and validate it can be put into the given column type.
-		* @param row - 
-		* @param userTimeZone - 
-		* @return Promise of dh.InputTable
-		*/
-		addRow(row:{ [key: string]: any; }, userTimeZone?:string):Promise<InputTable>;
-		/**
-		* Add multiple rows to a table.
-		* @param rows - 
-		* @param userTimeZone - 
-		* @return Promise of dh.InputTable
-		*/
-		addRows(rows:{ [key: string]: any; }[], userTimeZone?:string):Promise<InputTable>;
-		/**
-		* Add an entire table to this Input Table. Only column names that match the definition of the input table will be
-		* copied, and all key columns must have values filled in. This only copies the current state of the source table;
-		* future updates to the source table will not be reflected in the Input Table. The returned promise will be
-		* resolved to the same InputTable instance this method was called upon once the server returns.
-		* @param tableToAdd - 
-		* @return Promise of dh.InputTable
-		*/
-		addTable(tableToAdd:Table):Promise<InputTable>;
-		/**
-		* Add multiple tables to this Input Table.
-		* @param tablesToAdd - 
-		* @return Promise of dh.InputTable
-		*/
-		addTables(tablesToAdd:Table[]):Promise<InputTable>;
-		/**
-		* Deletes an entire table from this Input Table. Key columns must match the Input Table.
-		* @param tableToDelete - 
-		* @return Promise of dh.InputTable
-		*/
-		deleteTable(tableToDelete:Table):Promise<InputTable>;
-		/**
-		* Delete multiple tables from this Input Table.
-		* @param tablesToDelete - 
-		* @return 
-		*/
-		deleteTables(tablesToDelete:Table[]):Promise<InputTable>;
-		/**
-		* A list of the key columns, by name
-		* @return String array.
-		*/
-		get keys():string[];
-		/**
-		* A list of the value columns, by name
-		* @return String array.
-		*/
-		get values():string[];
-		/**
-		* A list of the key columns.
-		* @return Column array.
-		*/
-		get keyColumns():Column[];
-		/**
-		* A list of the value Column objects
-		* @return {@link dh.Column} array.
-		*/
-		get valueColumns():Column[];
-		/**
-		* The source table for this Input Table
-		* @return dh.table
-		*/
-		get table():Table;
-	}
-
-	/**
-	* Event fired when a command is issued from the client.
-	*/
-	export class CommandInfo {
-		constructor(code:string, result:Promise<dh.ide.CommandResult>);
-
-		get result():Promise<dh.ide.CommandResult>;
-		get code():string;
-	}
-
-	/**
-	* Behaves like a {@link dh.Table} externally, but data, state, and viewports are managed by an entirely different
-	* mechanism, and so reimplemented here.
-	* <p>
-	* Any time a change is made, we build a new request and send it to the server, and wait for the updated state.
-	* <p>
-	* Semantics around getting updates from the server are slightly different - we don't "unset" the viewport here after
-	* operations are performed, but encourage the client code to re-set them to the desired position.
-	* <p>
-	* The table size will be -1 until a viewport has been fetched.
-	* <p>
-	* Similar to a table, a Tree Table provides access to subscribed viewport data on the current hierarchy. A different
-	* Row type is used within that viewport, showing the depth of that node within the tree and indicating details about
-	* whether it has children or is expanded. The Tree Table itself then provides the ability to change if a row is
-	* expanded or not. Methods used to control or check if a row should be expanded or not can be invoked on a TreeRow
-	* instance, or on the number of the row (thus allowing for expanding/collapsing rows which are not currently visible in
-	* the viewport).
-	* <p>
-	* Events and viewports are somewhat different from tables, due to the expense of computing the expanded/collapsed rows
-	* and count of children at each level of the hierarchy, and differences in the data that is available.
-	* <p>
-	* <ul>
-	* <li>There is no {@link Table.totalSize | totalSize} property.</li>
-	* <li>The viewport is not un-set when changes are made to filter or sort, but changes will continue to be streamed in.
-	* It is suggested that the viewport be changed to the desired position (usually the first N rows) after any filter/sort
-	* change is made. Likewise, {@link getViewportData} will always return the most recent data, and will not wait if a
-	* new operation is pending.</li>
-	* <li>Custom columns are supported on Rollup tables, but not on Tree tables. If the TreeTable was created client-side,
-	* the original Table can have custom columns applied, and the TreeTable can be recreated.</li>
-	* <li>Whereas Table has a {@link Table.totalsTableConfig} property, it is defined here as a method,
-	* {@link getTotalsTableConfig}. This returns a promise so the config can be fetched asynchronously.</li>
-	* <li>Totals Tables for trees vary in behavior between tree tables and roll-up tables. This behavior is based on the
-	* original flat table used to produce the Tree Table - for a hierarchical table (i.e. Table.treeTable in the query
-	* config), the totals will include non-leaf nodes (since they are themselves actual rows in the table), but in a
-	* roll-up table, the totals only include leaf nodes (as non-leaf nodes are generated through grouping the contents of
-	* the original table). Roll-ups also have the {@link dh.includeConstituents} property, indicating that a
-	* {@link dh.Column} in the tree may have a {@link Column.constituentType} property reflecting that the type of cells
-	* where {@link TreeRowImpl.hasChildren} is false will be different from usual.</li>
-	* </ul>
-	*/
-	export class TreeTable implements HasEventHandling {
-		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
-		*/
-		static readonly EVENT_UPDATED:string;
-		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
-		*/
-		static readonly EVENT_DISCONNECT:string;
-		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
-		*/
-		static readonly EVENT_RECONNECT:string;
-		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
-		*/
-		static readonly EVENT_RECONNECTFAILED:string;
-		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
-		*/
-		static readonly EVENT_REQUEST_FAILED:string;
-		readonly description?:string|null;
-		readonly layoutHints?:null|LayoutHints;
-
-		protected constructor();
-
-		/**
-		* Expands the given node, so that its children are visible when they are in the viewport. The parameter can be the
-		* row index, or the row object itself. The second parameter is a boolean value, false by default, specifying if the
-		* row and all descendants should be fully expanded. Equivalent to `setExpanded(row, true)` with an optional third
-		* boolean parameter.
-		* @param row - 
-		* @param expandDescendants - 
-		*/
-		expand(row:TreeRow|number, expandDescendants?:boolean):void;
-		/**
-		* Collapses the given node, so that its children and descendants are not visible in the size or the viewport. The
-		* parameter can be the row index, or the row object itself. Equivalent to <b>setExpanded(row, false, false)</b>.
-		* @param row - 
-		*/
-		collapse(row:TreeRow|number):void;
-		/**
-		* Specifies if the given node should be expanded or collapsed. If this node has children, and the value is changed,
-		* the size of the table will change. If node is to be expanded and the third parameter, <b>expandDescendants</b>,
-		* is true, then its children will also be expanded.
-		* @param row - the row to expand or collapse, either the absolute row index or the row object
-		* @param isExpanded - true to expand the row, false to collapse
-		* @param expandDescendants - true to expand the row and all descendants, false to expand only the row, defaults to
-		*        false
-		*/
-		setExpanded(row:TreeRow|number, isExpanded:boolean, expandDescendants?:boolean):void;
-		expandAll():void;
-		collapseAll():void;
-		/**
-		* Tests if the specified row is expanded.
-		* @param row - the row to test, either the absolute row index or the row object
-		* @return boolean true if the row is expanded, false otherwise
-		*/
-		isExpanded(row:TreeRow|number):boolean;
-		setViewport(firstRow:number, lastRow:number, columns?:Array<Column>|undefined|null, updateInterval?:number|undefined|null):void;
-		getViewportData():Promise<TreeViewportData>;
-		/**
-		* Indicates that the table will no longer be used, and server resources can be freed.
-		*/
-		close():void;
+		close():void;
 		/**
 		* Applies the given sort to all levels of the tree. Returns the previous sort in use.
 		* @param sort - 
@@ -1968,513 +2109,125 @@ export namespace dh {
 		* in the resulting table.</li>
 		* </ul>
 		*/
-		selectDistinct(columns:Column[]):Promise<Table>;
-		getTotalsTableConfig():Promise<TotalsTableConfig>;
-		getTotalsTable(config?:object):Promise<TotalsTable>;
-		getGrandTotalsTable(config?:object):Promise<TotalsTable>;
-		/**
-		* a new copy of this treetable, so it can be sorted and filtered separately, and maintain a different viewport.
-		* Unlike Table, this will _not_ copy the filter or sort, since tree table viewport semantics differ, and without a
-		* viewport set, the treetable doesn't evaluate these settings, and they aren't readable on the properties. Expanded
-		* state is also not copied.
-		* @return Promise of dh.TreeTable
-		*/
-		copy():Promise<TreeTable>;
-		/**
-		* Returns the columns that are aggregated.
-		* @return array of aggregated columns
-		*/
-		get aggregatedColumns():Array<Column>;
-		/**
-		* The columns that can be shown in this Tree Table.
-		* @return {@link dh.Column} array
-		*/
-		get columns():Array<Column>;
-		/**
-		* The current sort configuration of this Tree Table
-		* @return {@link dh.Sort} array.
-		*/
-		get sort():Array<Sort>;
-		/**
-		* The current list of custom columns added to this Tree Table.
-		* @return {@link dh.CustomColumn} array
-		*/
-		get customColumns():Array<CustomColumn>;
-		/**
-		* True if this table may receive updates from the server, including size changed events, updated events after
-		* initial snapshot.
-		* @return boolean
-		*/
-		get isRefreshing():boolean;
-		/**
-		* The current filter configuration of this Tree Table.
-		* @return {@link dh.FilterCondition} array
-		*/
-		get filter():Array<FilterCondition>;
-		/**
-		* True if this is a roll-up and will provide the original rows that make up each grouping.
-		* @return boolean
-		*/
-		get includeConstituents():boolean;
-		get groupedColumns():Array<Column>;
-		/**
-		* True if this table has been closed.
-		* @return boolean
-		*/
-		get isClosed():boolean;
-		/**
-		* The current number of rows given the table's contents and the various expand/collapse states of each node. (No
-		* totalSize is provided at this time; its definition becomes unclear between roll-up and tree tables, especially
-		* when considering collapse/expand states).
-		* @return double
-		*/
-		get size():number;
-		/**
-		* Listen for events on this object.
-		* @param name - the name of the event to listen for
-		* @param callback - a function to call when the event occurs
-		* @return Returns a cleanup function.
-		* @typeParam T - the type of the data that the event will provide
-		*/
-		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
-		hasListeners(name:string):boolean;
-		/**
-		* Removes an event listener added to this table.
-		* @param name - 
-		* @param callback - 
-		* @return 
-		* @typeParam T - 
-		*/
-		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
-	}
-
-	/**
-	* Exists to keep the dh.TableMap namespace so that the web UI can remain compatible with the DHE API, which still calls
-	* this type TableMap.
-	* @deprecated
-	*/
-	export class TableMap {
-		static readonly EVENT_KEYADDED:string;
-		static readonly EVENT_DISCONNECT:string;
-		static readonly EVENT_RECONNECT:string;
-		static readonly EVENT_RECONNECTFAILED:string;
-
-		protected constructor();
-	}
-
-	/**
-	* A Widget represents a server side object that sends one or more responses to the client. The client can then
-	* interpret these responses to see what to render, or how to respond.
-	* <p>
-	* Most custom object types result in a single response being sent to the client, often with other exported objects, but
-	* some will have streamed responses, and allow the client to send follow-up requests of its own. This class's API is
-	* backwards compatible, but as such does not offer a way to tell the difference between a streaming or non-streaming
-	* object type, the client code that handles the payloads is expected to know what to expect. See
-	* {@link dh.WidgetMessageDetails} for more information.
-	* <p>
-	* When the promise that returns this object resolves, it will have the first response assigned to its fields. Later
-	* responses from the server will be emitted as "message" events. When the connection with the server ends, the "close"
-	* event will be emitted. In this way, the connection will behave roughly in the same way as a WebSocket - either side
-	* can close, and after close no more messages will be processed. There can be some latency in closing locally while
-	* remote messages are still pending - it is up to implementations of plugins to handle this case.
-	* <p>
-	* Also like WebSockets, the plugin API doesn't define how to serialize messages, and just handles any binary payloads.
-	* What it does handle however, is allowing those messages to include references to server-side objects with those
-	* payloads. Those server side objects might be tables or other built-in types in the Deephaven JS API, or could be
-	* objects usable through their own plugins. They also might have no plugin at all, allowing the client to hold a
-	* reference to them and pass them back to the server, either to the current plugin instance, or through another API.
-	* The `Widget` type does not specify how those objects should be used or their lifecycle, but leaves that
-	* entirely to the plugin. Messages will arrive in the order they were sent.
-	* <p>
-	* This can suggest several patterns for how plugins operate:
-	* <ul>
-	* <li>The plugin merely exists to transport some other object to the client. This can be useful for objects which can
-	* easily be translated to some other type (like a Table) when the user clicks on it. An example of this is
-	* `pandas.DataFrame` will result in a widget that only contains a static
-	* {@link dh.Table}. Presently, the widget is immediately closed, and only the Table is
-	* provided to the JS API consumer.</li>
-	* <li>The plugin provides references to Tables and other objects, and those objects can live longer than the object
-	* which provided them. One concrete example of this could have been
-	* {@link dh.PartitionedTable} when fetching constituent tables, but it was implemented
-	* before bidirectional plugins were implemented. Another example of this is plugins that serve as a "factory", giving
-	* the user access to table manipulation/creation methods not supported by gRPC or the JS API.</li>
-	* <li>The plugin provides reference to Tables and other objects that only make sense within the context of the widget
-	* instance, so when the widget goes away, those objects should be released as well. This is also an example of
-	* {@link dh.PartitionedTable}, as the partitioned table tracks creation of new keys through
-	* an internal table instance.</li>
-	* </ul>
-	*
-	* Handling server objects in messages also has more than one potential pattern that can be used:
-	* <ul>
-	* <li>One object per message - the message clearly is about that object, no other details required.</li>
-	* <li>Objects indexed within their message - as each message comes with a list of objects, those objects can be
-	* referenced within the payload by index. This is roughly how {@link dh.plot.Figure}
-	* behaves, where the figure descriptor schema includes an index for each created series, describing which table should
-	* be used, which columns should be mapped to each axis.</li>
-	* <li>Objects indexed since widget creation - each message would append its objects to a list created when the widget
-	* was first made, and any new exports that arrive in a new message would be appended to that list. Then, subsequent
-	* messages can reference objects already sent. This imposes a limitation where the client cannot release any exports
-	* without the server somehow signaling that it will never reference that export again.</li>
-	* </ul>
-	*/
-	export class Widget implements WidgetMessageDetails, HasEventHandling {
-		static readonly EVENT_MESSAGE:string;
-		static readonly EVENT_CLOSE:string;
-
-		protected constructor();
-
-		/**
-		* Ends the client connection to the server.
-		*/
-		close():void;
-		getDataAsBase64():string;
-		getDataAsU8():Uint8Array;
-		getDataAsString():string;
-		/**
-		* Sends a string/bytes payload to the server, along with references to objects that exist on the server.
-		* @param msg - string/buffer/view instance that represents data to send
-		* @param references - an array of objects that can be safely sent to the server
-		*/
-		sendMessage(msg:string|ArrayBuffer|ArrayBufferView, references?:Array<Table|Widget|WidgetExportedObject|PartitionedTable|TotalsTable|TreeTable>):void;
-		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
-		hasListeners(name:string):boolean;
-		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
-		/**
-		* 
-		* @return the exported objects sent in the initial message from the server. The client is responsible for closing
-		*         them when finished using them.
-		*/
-		get exportedObjects():WidgetExportedObject[];
-		/**
-		* 
-		* @return the type of this widget
-		*/
-		get type():string;
-	}
-
-	export class IdeSession implements HasEventHandling {
-		static readonly EVENT_COMMANDSTARTED:string;
-		static readonly EVENT_REQUEST_FAILED:string;
-
-		protected constructor();
-
-		/**
-		* Load the named table, with columns and size information already fully populated.
-		* @param name - the name of the table to fetch
-		* @param applyPreviewColumns - false to disable previews, defaults to true
-		* @return a {@link Promise} that will resolve to the table, or reject with an error if it cannot be loaded.
-		* @deprecated Added to resolve a specific issue, in the future preview will be applied as part of the subscription.
-		*/
-		getTable(name:string, applyPreviewColumns?:boolean):Promise<Table>;
-		/**
-		* Load the named Figure, including its tables and tablemaps as needed.
-		* @param name - 
-		* @return promise of dh.plot.Figure
-		*/
-		getFigure(name:string):Promise<dh.plot.Figure>;
-		/**
-		* Loads the named tree table or roll-up table, with column data populated. All nodes are collapsed by default, and
-		* size is presently not available until the viewport is first set.
-		* @param name - 
-		* @return {@link Promise} of {@link dh.TreeTable}
-		*/
-		getTreeTable(name:string):Promise<TreeTable>;
-		getHierarchicalTable(name:string):Promise<TreeTable>;
-		getPartitionedTable(name:string):Promise<PartitionedTable>;
-		getObject(definitionObject:dh.ide.VariableDescriptor):Promise<any>;
-		newTable(columnNames:string[], types:string[], data:string[][], userTimeZone:string):Promise<Table>;
-		/**
-		* Merges the given tables into a single table. Assumes all tables have the same structure.
-		* @param tables - 
-		* @return {@link Promise} of {@link dh.Table}
-		*/
-		mergeTables(tables:Table[]):Promise<Table>;
-		bindTableToVariable(table:Table, name:string):Promise<void>;
-		/**
-		* Makes the `object` available to another user or another client on this same server which knows the value of
-		* the `sharedTicketBytes`. Use that sharedTicketBytes value like a one-time use password - any other client
-		* which knows this value can read the same object.
-		* <p>
-		* Shared objects will remain available using the sharedTicketBytes until the client that first shared them
-		* releases/closes their copy of the object. Whatever side-channel is used to share the bytes, be sure to wait until
-		* the remote end has signaled that it has successfully fetched the object before releasing it from this client.
-		* <p>
-		* Be sure to use an unpredictable value for the shared ticket bytes, like a UUID or other large, random value to
-		* prevent access by unauthorized clients.
-		* @param object - the object to share with another client/user
-		* @param sharedTicketBytes - the value which another client/user must know to obtain the object. It may be a unicode
-		*        string (will be encoded as utf8 bytes), or a {@link Uint8Array} value.
-		* @return A promise that will resolve to the value passed as sharedTicketBytes when the object is ready to be read
-		*         by another client, or will reject if an error occurs.
-		*/
-		shareObject(object:Table|Widget|WidgetExportedObject|PartitionedTable|TotalsTable|TreeTable, sharedTicketBytes:string|Uint8Array):Promise<string|Uint8Array>;
-		/**
-		* Reads an object shared by another client to this server with the `sharedTicketBytes`. Until the other
-		* client releases this object (or their session ends), the object will be available on the server.
-		* <p>
-		* The type of the object must be passed so that the object can be read from the server correct - the other client
-		* should provide this information.
-		* @param sharedTicketBytes - the value provided by another client/user to obtain the object. It may be a unicode
-		*        string (will be encoded as utf8 bytes), or a {@link Uint8Array} value.
-		* @param type - The type of the object, so it can be correctly read from the server
-		* @return A promise that will resolve to the shared object, or will reject with an error if it cannot be read.
-		*/
-		getSharedObject(sharedTicketBytes:string|Uint8Array, type:string):Promise<any>;
-		subscribeToFieldUpdates(callback:(arg0:dh.ide.VariableChanges)=>void):()=>void;
-		close():void;
-		runCode(code:string):Promise<dh.ide.CommandResult>;
-		onLogMessage(callback:(arg0:dh.ide.LogItem)=>void):()=>void;
-		openDocument(params:object):void;
-		changeDocument(params:object):void;
-		getCompletionItems(params:object):Promise<Array<dh.lsp.CompletionItem>>;
-		getSignatureHelp(params:object):Promise<Array<dh.lsp.SignatureInformation>>;
-		getHover(params:object):Promise<dh.lsp.Hover>;
-		closeDocument(params:object):void;
-		/**
-		* Creates an empty table with the specified number of rows. Optionally columns and types may be specified, but all
-		* values will be null.
-		* @param size - 
-		* @return {@link Promise} of {@link dh.Table}
-		*/
-		emptyTable(size:number):Promise<Table>;
-		/**
-		* Creates a new table that ticks automatically every "periodNanos" nanoseconds. A start time may be provided; if so
-		* the table will be populated with the interval from the specified date until now.
-		* @param periodNanos - 
-		* @param startTime - 
-		* @return {@link Promise} of {@link dh.Table}
-		*/
-		timeTable(periodNanos:number, startTime?:DateWrapper):Promise<Table>;
-		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
-		hasListeners(name:string):boolean;
-		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
-	}
-
-	export class CustomColumn {
-		static readonly TYPE_FORMAT_COLOR:string;
-		static readonly TYPE_FORMAT_NUMBER:string;
-		static readonly TYPE_FORMAT_DATE:string;
-		static readonly TYPE_NEW:string;
-
-		protected constructor();
-
-		valueOf():string;
-		toString():string;
-		static from(columnInfo:string):CustomColumn;
-		/**
-		* The expression to evaluate this custom column.
-		* @return String
-		*/
-		get expression():string;
-		/**
-		* The name of the column to use.
-		* @return String
-		*/
-		get name():string;
-		/**
-		* The options for this custom column.
-		* @return CustomColumOptions
-		*/
-		get options():CustomColumnOptions;
-		/**
-		* Type of custom column. One of
-		*
-		* <ul>
-		* <li>FORMAT_COLOR</li>
-		* <li>FORMAT_NUMBER</li>
-		* <li>FORMAT_DATE</li>
-		* <li>NEW</li>
-		* </ul>
-		* @return String
-		*/
-		get type():string;
-	}
-
-	/**
-	* Describes a filter which can be applied to a table. Replacing these instances may be more expensive than reusing
-	* them. These instances are immutable - all operations that compose them to build bigger expressions return a new
-	* instance.
-	*/
-	export class FilterCondition {
-		protected constructor();
-
-		/**
-		* the opposite of this condition
-		* @return FilterCondition
-		*/
-		not():FilterCondition;
+		selectDistinct(columns:Column[]):Promise<Table>;
+		getTotalsTableConfig():Promise<TotalsTableConfig>;
+		getTotalsTable(config?:object):Promise<TotalsTable>;
+		getGrandTotalsTable(config?:object):Promise<TotalsTable>;
 		/**
-		* a condition representing the current condition logically ANDed with the other parameters
-		* @param filters - 
-		* @return FilterCondition
+		* a new copy of this treetable, so it can be sorted and filtered separately, and maintain a different viewport.
+		* Unlike Table, this will _not_ copy the filter or sort, since tree table viewport semantics differ, and without a
+		* viewport set, the treetable doesn't evaluate these settings, and they aren't readable on the properties. Expanded
+		* state is also not copied.
+		* @return Promise of dh.TreeTable
 		*/
-		and(...filters:FilterCondition[]):FilterCondition;
+		copy():Promise<TreeTable>;
 		/**
-		* a condition representing the current condition logically ORed with the other parameters
-		* @param filters - 
-		* @return FilterCondition.
+		* Returns the columns that are aggregated.
+		* @return array of aggregated columns
 		*/
-		or(...filters:FilterCondition[]):FilterCondition;
+		get aggregatedColumns():Array<Column>;
 		/**
-		* a string suitable for debugging showing the details of this condition.
-		* @return String.
+		* The columns that can be shown in this Tree Table.
+		* @return {@link dh.Column} array
 		*/
-		toString():string;
 		get columns():Array<Column>;
 		/**
-		* a filter condition invoking a static function with the given parameters. Currently supported Deephaven static
-		* functions:
-		* <ul>
-		* <li><b>inRange</b>: Given three comparable values, returns true if the first is less than the second but greater
-		* than the third</li>
-		* <li><b>isInf</b>:Returns true if the given number is <i>infinity</i></li>
-		* <li><b>isNaN</b>:Returns true if the given number is <i>not a number</i></li>
-		* <li><b>isNormal</b>:Returns true if the given number <i>is not null</i>, <i>is not infinity</i>, and <i>is not
-		* "not a number"</i></li>
-		* <li><b>startsWith</b>:Returns true if the first string starts with the second string</li>
-		* <li><b>endsWith</b>Returns true if the first string ends with the second string</li>
-		* <li><b>matches</b>:Returns true if the first string argument matches the second string used as a Java regular
-		* expression</li>
-		* <li><b>contains</b>:Returns true if the first string argument contains the second string as a substring</li>
-		* <li><b>in</b>:Returns true if the first string argument can be found in the second array argument.
-		* <p>
-		* Note that the array can only be specified as a column reference at this time - typically the `FilterValue.in`
-		* method should be used in other cases
-		* </p>
-		* </li>
-		* </ul>
-		* @param function - 
-		* @param args - 
-		* @return dh.FilterCondition
+		* The current sort configuration of this Tree Table
+		* @return {@link dh.Sort} array.
 		*/
-		static invoke(func:string, ...args:FilterValue[]):FilterCondition;
+		get sort():Array<Sort>;
 		/**
-		* a filter condition which will check if the given value can be found in any supported column on whatever table
-		* this FilterCondition is passed to. This FilterCondition is somewhat unique in that it need not be given a column
-		* instance, but will adapt to any table. On numeric columns, with a value passed in which can be parsed as a
-		* number, the column will be filtered to numbers which equal, or can be "rounded" effectively to this number. On
-		* String columns, the given value will match any column which contains this string in a case-insensitive search. An
-		* optional second argument can be passed, an array of `FilterValue` from the columns to limit this search to (see
-		* {@link dh.Column.filter}).
-		* @param value - 
-		* @param columns - 
-		* @return dh.FilterCondition
+		* The current list of custom columns added to this Tree Table.
+		* @return {@link dh.CustomColumn} array
 		*/
-		static search(value:FilterValue, columns?:FilterValue[]):FilterCondition;
-	}
-
-	export class CoreClient implements HasEventHandling {
-		static readonly EVENT_CONNECT:string;
-		static readonly EVENT_DISCONNECT:string;
-		static readonly EVENT_RECONNECT:string;
-		static readonly EVENT_RECONNECT_AUTH_FAILED:string;
-		static readonly EVENT_REQUEST_FAILED:string;
-		static readonly EVENT_REQUEST_STARTED:string;
-		static readonly EVENT_REQUEST_SUCCEEDED:string;
+		get customColumns():Array<CustomColumn>;
 		/**
-		* @deprecated
+		* True if this table may receive updates from the server, including size changed events, updated events after
+		* initial snapshot.
+		* @return boolean
 		*/
-		static readonly EVENT_REFRESH_TOKEN_UPDATED:string;
-		static readonly LOGIN_TYPE_PASSWORD:string;
-		static readonly LOGIN_TYPE_ANONYMOUS:string;
-
-		constructor(serverUrl:string, connectOptions?:ConnectOptions);
-
-		running():Promise<CoreClient>;
-		getServerUrl():string;
-		getAuthConfigValues():Promise<string[][]>;
-		login(credentials:LoginCredentials):Promise<void>;
-		relogin(token:RefreshToken):Promise<void>;
-		onConnected(timeoutInMillis?:number):Promise<void>;
-		getServerConfigValues():Promise<string[][]>;
-		getStorageService():dh.storage.StorageService;
-		getAsIdeConnection():Promise<IdeConnection>;
-		disconnect():void;
-		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
-		hasListeners(name:string):boolean;
-		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
-	}
-
-	/**
-	* Describes a grouping and aggregations for a roll-up table. Pass to the <b>Table.rollup</b> function to create a
-	* roll-up table.
-	*/
-	export class RollupConfig {
+		get isRefreshing():boolean;
 		/**
-		* Ordered list of columns to group by to form the hierarchy of the resulting roll-up table.
+		* The current filter configuration of this Tree Table.
+		* @return {@link dh.FilterCondition} array
 		*/
-		groupingColumns:Array<String>;
+		get filter():Array<FilterCondition>;
 		/**
-		* Mapping from each aggregation name to the ordered list of columns it should be applied to in the resulting
-		* roll-up table.
+		* True if this is a roll-up and will provide the original rows that make up each grouping.
+		* @return boolean
 		*/
-		aggregations:{ [key: string]: Array<string>; };
+		get includeConstituents():boolean;
+		get groupedColumns():Array<Column>;
 		/**
-		* Optional parameter indicating if an extra leaf node should be added at the bottom of the hierarchy, showing the
-		* rows in the underlying table which make up that grouping. Since these values might be a different type from the
-		* rest of the column, any client code must check if TreeRow.hasChildren = false, and if so, interpret those values
-		* as if they were Column.constituentType instead of Column.type. Defaults to false.
+		* True if this table has been closed.
+		* @return boolean
 		*/
-		includeConstituents:boolean;
-		includeOriginalColumns?:boolean|null;
+		get isClosed():boolean;
 		/**
-		* Optional parameter indicating if original column descriptions should be included. Defaults to true.
+		* The current number of rows given the table's contents and the various expand/collapse states of each node. (No
+		* totalSize is provided at this time; its definition becomes unclear between roll-up and tree tables, especially
+		* when considering collapse/expand states).
+		* @return double
 		*/
-		includeDescriptions:boolean;
-
-		constructor();
-	}
-
-	/**
-	* Options for custom columns.
-	*/
-	export class CustomColumnOptions {
+		get size():number;
 		/**
-		* When specified for custom columns on a rollup table, specifies if the formula apply to rollup or constituent
-		* nodes.
+		* Listen for events on this object.
+		* @param name - the name of the event to listen for
+		* @param callback - a function to call when the event occurs
+		* @return Returns a cleanup function.
+		* @typeParam T - the type of the data that the event will provide
 		*/
-		rollupNodeType?:RollupNodeTypeType|null;
-
-		constructor();
+		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
+		hasListeners(name:string):boolean;
+		/**
+		* Removes an event listener added to this table.
+		* @param name - 
+		* @param callback - 
+		* @return 
+		* @typeParam T - 
+		*/
+		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
 	}
 
 	/**
-	* Represents a non-viewport subscription to a table, and all data currently known to be present in the subscribed
-	* columns. This class handles incoming snapshots and deltas, and fires events to consumers to notify of data changes.
-	* <p>
-	* Unlike {@link dh.TableViewportSubscription}, the "original" table does not have a reference to this instance, only the
-	* "private" table instance does, since the original cannot modify the subscription, and the private instance must
-	* forward data to it.
-	* <p>
-	* Represents a subscription to the table on the server. Changes made to the table will not be reflected here - the
-	* subscription must be closed and a new one optioned to see those changes. The event model is slightly different from
-	* viewports to make it less expensive to compute for large tables.
+	* This object serves as a "handle" to a subscription, allowing it to be acted on directly or canceled outright. If you
+	* retain an instance of this, you have two choices - either only use it to call `close()` on it to stop the table's
+	* viewport without creating a new one, or listen directly to this object instead of the table for data events, and
+	* always call `close()` when finished. Calling any method on this object other than close() will result in it
+	* continuing to live on after `setViewport` is called on the original table, or after the table is modified.
 	*/
-	export class TableSubscription implements HasEventHandling {
+	export class TableViewportSubscription implements HasEventHandling {
 		protected constructor();
 
-		static createTableSubscription(options:SubscriptionOptions, existingTable:Table):TableSubscription;
 		/**
-		* Updates the subscription to use the given columns and update interval.
-		* @param columns - the new columns to subscribe to
-		* @param updateIntervalMs - the new update interval, or null/omit to use the default of one second
+		* Changes the rows and columns set on this viewport. This cannot be used to change the update interval.
+		* @param firstRow - 
+		* @param lastRow - 
+		* @param columns - 
+		* @param updateIntervalMs - 
+		* @deprecated use {@link #update(Object)} instead
 		*/
-		changeSubscription(columns:Array<Column>, updateIntervalMs:number|undefined|null):void;
+		setViewport(firstRow:number, lastRow:number, columns?:Column[]|undefined|null, updateIntervalMs?:number|undefined|null, isReverseViewport?:boolean|undefined|null):void;
 		/**
 		* Update the options for this viewport subscription. This cannot alter the update interval or preview options.
 		* @param options - the subscription options
 		*/
-		update(options:SubscriptionOptions):void;
-		get columns():Array<Column>;
+		update(options:ViewportSubscriptionOptions):void;
 		/**
-		* Stops the subscription on the server.
+		* Stops this viewport from running, stopping all events on itself and on the table that created it.
 		*/
 		close():void;
 		/**
+		* Gets the data currently visible in this viewport
+		* @return Promise of {@link dh.TableData}.
+		*/
+		getViewportData():Promise<ViewportData>;
+		/**
+		* @deprecated
+		*/
+		snapshot(rows:RangeSet, columns:Column[]):Promise<TableData>;
+		/**
 		* Listen for events on this object.
 		* @param name - the name of the event to listen for
 		* @param callback - a function to call when the event occurs
@@ -2495,87 +2248,133 @@ export namespace dh {
 	}
 
 	/**
-	* Describes how a Totals Table will be generated from its parent table. Each table has a default (which may be null)
-	* indicating how that table was configured when it was declared, and each Totals Table has a similar property
-	* describing how it was created. Both the <b>Table.getTotalsTable</b> and <b>Table.getGrandTotalsTable</b> methods take
-	* this config as an optional parameter - without it, the table's default will be used, or if null, a default instance
-	* of <b>TotalsTableConfig</b> will be supplied.
+	* Configuration object for running Table.treeTable to produce a hierarchical view of a given "flat" table.
 	*
-	* This class has a no-arg constructor, allowing an instance to be made with the default values provided. However, any
-	* JS object can be passed in to the methods which accept instances of this type, provided their values adhere to the
-	* expected formats.
+	* Like TotalsTableConfig, `TreeTableConfig` supports an operation map indicating how to aggregate the data, as well as
+	* an array of column names which will be the layers in the roll-up tree, grouped at each level. An additional optional
+	* value can be provided describing the strategy the engine should use when grouping the rows.
 	*/
-	export class TotalsTableConfig {
-		/**
-		* @deprecated
-		*/
-		static readonly COUNT:string;
-		/**
-		* @deprecated
-		*/
-		static readonly MIN:string;
-		/**
-		* @deprecated
-		*/
-		static readonly MAX:string;
+	export class TreeTableConfig {
 		/**
-		* @deprecated
+		* The column representing the unique ID for each item
 		*/
-		static readonly SUM:string;
+		idColumn:string;
 		/**
-		* @deprecated
+		* The column representing the parent ID for each item
 		*/
-		static readonly ABS_SUM:string;
+		parentColumn:string;
 		/**
-		* @deprecated
+		* Optional parameter indicating if items with an invalid parent ID should be promoted to root. Defaults to false.
 		*/
-		static readonly VAR:string;
+		promoteOrphansToRoot:boolean;
+
+		constructor();
+	}
+
+	export class DateWrapper extends LongWrapper {
+		protected constructor();
+
+		static ofJsDate(date:Date):DateWrapper;
+		asDate():Date;
+	}
+
+	/**
+	* Describes a Sort present on the table. No visible constructor, created through the use of Column.sort(), will be tied
+	* to that particular column data. Sort instances are immutable, and use a builder pattern to make modifications. All
+	* methods return a new Sort instance.
+	*/
+	export class Sort {
+		static readonly ASCENDING:string;
+		static readonly DESCENDING:string;
+		static readonly REVERSE:string;
+
+		protected constructor();
+
 		/**
-		* @deprecated
+		* Builds a Sort instance to sort values in ascending order.
+		* @return {@link dh.Sort}
 		*/
-		static readonly AVG:string;
+		asc():Sort;
 		/**
-		* @deprecated
+		* Builds a Sort instance to sort values in descending order.
+		* @return {@link dh.Sort}
 		*/
-		static readonly STD:string;
+		desc():Sort;
 		/**
-		* @deprecated
+		* Builds a Sort instance which takes the absolute value before applying order.
+		* @return {@link dh.Sort}
 		*/
-		static readonly FIRST:string;
+		abs():Sort;
+		toString():string;
 		/**
-		* @deprecated
+		* True if the absolute value of the column should be used when sorting; defaults to false.
+		* @return boolean
 		*/
-		static readonly LAST:string;
+		get isAbs():boolean;
 		/**
-		* @deprecated
+		* The column which is sorted.
+		* @return {@link dh.Column}
 		*/
-		static readonly SKIP:string;
+		get column():Column;
 		/**
-		* Specifies if a Totals Table should be expanded by default in the UI. Defaults to false.
+		* The direction of this sort, either <b>ASC</b>, <b>DESC</b>, or <b>REVERSE</b>.
+		* @return String
 		*/
-		showTotalsByDefault:boolean;
+		get direction():string;
+	}
+
+	export class CustomColumn {
+		static readonly TYPE_FORMAT_COLOR:string;
+		static readonly TYPE_FORMAT_NUMBER:string;
+		static readonly TYPE_FORMAT_DATE:string;
+		static readonly TYPE_NEW:string;
+
+		protected constructor();
+
+		valueOf():string;
+		toString():string;
+		static from(columnInfo:string):CustomColumn;
 		/**
-		* Specifies if a Grand Totals Table should be expanded by default in the UI. Defaults to false.
+		* The expression to evaluate this custom column.
+		* @return String
 		*/
-		showGrandTotalsByDefault:boolean;
+		get expression():string;
 		/**
-		* Specifies the default operation for columns that do not have a specific operation applied; defaults to "Sum".
+		* The name of the column to use.
+		* @return String
 		*/
-		defaultOperation:AggregationOperationType;
+		get name():string;
 		/**
-		* Mapping from each column name to the aggregation(s) that should be applied to that column in the resulting Totals
-		* Table. If a column is omitted, the defaultOperation is used.
+		* The options for this custom column.
+		* @return CustomColumOptions
 		*/
-		operationMap:{ [key: string]: Array<AggregationOperationType>; };
+		get options():CustomColumnOptions;
 		/**
-		* Groupings to use when generating the Totals Table. One row will exist for each unique set of values observed in
-		* these columns. See also `Table.selectDistinct`.
+		* Type of custom column. One of
+		*
+		* <ul>
+		* <li>FORMAT_COLOR</li>
+		* <li>FORMAT_NUMBER</li>
+		* <li>FORMAT_DATE</li>
+		* <li>NEW</li>
+		* </ul>
+		* @return String
 		*/
-		groupBy:Array<string>;
+		get type():string;
+	}
 
-		constructor();
+	/**
+	* Wrap BigDecimal values for use in JS. Provides text formatting for display and access to the underlying value.
+	*/
+	export class BigDecimalWrapper {
+		protected constructor();
 
+		static ofString(value:string):BigDecimalWrapper;
+		asNumber():number;
+		valueOf():string;
 		toString():string;
+		equals(o:object):boolean;
+		hashCode():number;
 	}
 
 	/**
@@ -2726,73 +2525,232 @@ export namespace dh {
 		* regular expression</li>
 		* <li><b>contains</b>: Returns true if the current string value contains the supplied string argument
 		* <p>
-		* When invoking against a constant, this should be avoided in favor of FilterValue.contains
-		* </p>
-		* </li>
-		* </ul>
-		* @param method - 
-		* @param args - 
-		* @return 
+		* When invoking against a constant, this should be avoided in favor of FilterValue.contains
+		* </p>
+		* </li>
+		* </ul>
+		* @param method - 
+		* @param args - 
+		* @return 
+		*/
+		invoke(method:string, ...args:FilterValue[]):FilterCondition;
+		toString():string;
+		/**
+		* Constructs a string for the filter API from the given parameter.
+		* @param input - 
+		* @return 
+		*/
+		static ofString(input:any):FilterValue;
+		/**
+		* Constructs a boolean for the filter API from the given parameter.
+		* @param b - 
+		* @return 
+		*/
+		static ofBoolean(b:boolean):FilterValue;
+	}
+
+	export class CoreClient implements HasEventHandling {
+		static readonly EVENT_CONNECT:string;
+		static readonly EVENT_DISCONNECT:string;
+		static readonly EVENT_RECONNECT:string;
+		static readonly EVENT_RECONNECT_AUTH_FAILED:string;
+		static readonly EVENT_REQUEST_FAILED:string;
+		static readonly EVENT_REQUEST_STARTED:string;
+		static readonly EVENT_REQUEST_SUCCEEDED:string;
+		/**
+		* @deprecated
+		*/
+		static readonly EVENT_REFRESH_TOKEN_UPDATED:string;
+		static readonly LOGIN_TYPE_PASSWORD:string;
+		static readonly LOGIN_TYPE_ANONYMOUS:string;
+
+		constructor(serverUrl:string, connectOptions?:ConnectOptions);
+
+		running():Promise<CoreClient>;
+		getServerUrl():string;
+		getAuthConfigValues():Promise<string[][]>;
+		login(credentials:LoginCredentials):Promise<void>;
+		relogin(token:RefreshToken):Promise<void>;
+		onConnected(timeoutInMillis?:number):Promise<void>;
+		getServerConfigValues():Promise<string[][]>;
+		getStorageService():dh.storage.StorageService;
+		getAsIdeConnection():Promise<IdeConnection>;
+		disconnect():void;
+		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
+		hasListeners(name:string):boolean;
+		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
+	}
+
+	export class LongWrapper {
+		protected constructor();
+
+		static ofString(str:string):LongWrapper;
+		asNumber():number;
+		valueOf():string;
+		toString():string;
+	}
+
+	/**
+	* Addition optional configuration that can be passed to the {@link dh.CoreClient} constructor.
+	*/
+	export class ConnectOptions {
+		/**
+		* Optional map of http header names and values to send to the server with each request.
+		*/
+		headers?:{ [key: string]: string; }|null;
+		/**
+		* True to enable debug logging. At this time, only enables logging for gRPC calls.
+		*/
+		debug?:boolean|null;
+		/**
+		* Set this to true to force the use of websockets when connecting to the deephaven instance, false to force the use
+		* of `fetch`. Ignored if {@link dh.transportFactory} is set.
+		* <p>
+		* Defaults to null, indicating that the server URL should be checked to see if we connect with fetch or websockets.
+		*/
+		useWebsockets?:boolean|null;
+		/**
+		* The transport factory to use for creating gRPC streams. If specified, the JS API will ignore
+		* {@link dh.useWebsockets} and its own internal logic for determining the appropriate transport to use.
+		* <p>
+		* Defaults to null, indicating that the JS API should determine the appropriate transport to use. If
+		* `useWebsockets` is set to true, the JS API will use websockets, otherwise if the server url begins with
+		* https, it will use fetch, otherwise it will use websockets.
+		*/
+		transportFactory?:dh.grpc.GrpcTransportFactory|null;
+
+		constructor();
+	}
+
+	export class IdeSession implements HasEventHandling {
+		static readonly EVENT_COMMANDSTARTED:string;
+		static readonly EVENT_REQUEST_FAILED:string;
+
+		protected constructor();
+
+		/**
+		* Load the named table, with columns and size information already fully populated.
+		* @param name - the name of the table to fetch
+		* @param applyPreviewColumns - false to disable previews, defaults to true
+		* @return a {@link Promise} that will resolve to the table, or reject with an error if it cannot be loaded.
+		* @deprecated Added to resolve a specific issue, in the future preview will be applied as part of the subscription.
+		*/
+		getTable(name:string, applyPreviewColumns?:boolean):Promise<Table>;
+		/**
+		* Load the named Figure, including its tables and tablemaps as needed.
+		* @param name - 
+		* @return promise of dh.plot.Figure
+		*/
+		getFigure(name:string):Promise<dh.plot.Figure>;
+		/**
+		* Loads the named tree table or roll-up table, with column data populated. All nodes are collapsed by default, and
+		* size is presently not available until the viewport is first set.
+		* @param name - 
+		* @return {@link Promise} of {@link dh.TreeTable}
+		*/
+		getTreeTable(name:string):Promise<TreeTable>;
+		getHierarchicalTable(name:string):Promise<TreeTable>;
+		getPartitionedTable(name:string):Promise<PartitionedTable>;
+		getObject(definitionObject:dh.ide.VariableDescriptor):Promise<any>;
+		newTable(columnNames:string[], types:string[], data:string[][], userTimeZone:string):Promise<Table>;
+		/**
+		* Merges the given tables into a single table. Assumes all tables have the same structure.
+		* @param tables - 
+		* @return {@link Promise} of {@link dh.Table}
+		*/
+		mergeTables(tables:Table[]):Promise<Table>;
+		bindTableToVariable(table:Table, name:string):Promise<void>;
+		/**
+		* Makes the `object` available to another user or another client on this same server which knows the value of
+		* the `sharedTicketBytes`. Use that sharedTicketBytes value like a one-time use password - any other client
+		* which knows this value can read the same object.
+		* <p>
+		* Shared objects will remain available using the sharedTicketBytes until the client that first shared them
+		* releases/closes their copy of the object. Whatever side-channel is used to share the bytes, be sure to wait until
+		* the remote end has signaled that it has successfully fetched the object before releasing it from this client.
+		* <p>
+		* Be sure to use an unpredictable value for the shared ticket bytes, like a UUID or other large, random value to
+		* prevent access by unauthorized clients.
+		* @param object - the object to share with another client/user
+		* @param sharedTicketBytes - the value which another client/user must know to obtain the object. It may be a unicode
+		*        string (will be encoded as utf8 bytes), or a {@link Uint8Array} value.
+		* @return A promise that will resolve to the value passed as sharedTicketBytes when the object is ready to be read
+		*         by another client, or will reject if an error occurs.
+		*/
+		shareObject(object:Table|Widget|WidgetExportedObject|PartitionedTable|TotalsTable|TreeTable, sharedTicketBytes:string|Uint8Array):Promise<string|Uint8Array>;
+		/**
+		* Reads an object shared by another client to this server with the `sharedTicketBytes`. Until the other
+		* client releases this object (or their session ends), the object will be available on the server.
+		* <p>
+		* The type of the object must be passed so that the object can be read from the server correct - the other client
+		* should provide this information.
+		* @param sharedTicketBytes - the value provided by another client/user to obtain the object. It may be a unicode
+		*        string (will be encoded as utf8 bytes), or a {@link Uint8Array} value.
+		* @param type - The type of the object, so it can be correctly read from the server
+		* @return A promise that will resolve to the shared object, or will reject with an error if it cannot be read.
 		*/
-		invoke(method:string, ...args:FilterValue[]):FilterCondition;
-		toString():string;
+		getSharedObject(sharedTicketBytes:string|Uint8Array, type:string):Promise<any>;
+		subscribeToFieldUpdates(callback:(arg0:dh.ide.VariableChanges)=>void):()=>void;
+		close():void;
+		runCode(code:string):Promise<dh.ide.CommandResult>;
+		onLogMessage(callback:(arg0:dh.ide.LogItem)=>void):()=>void;
+		openDocument(params:object):void;
+		changeDocument(params:object):void;
+		getCompletionItems(params:object):Promise<Array<dh.lsp.CompletionItem>>;
+		getSignatureHelp(params:object):Promise<Array<dh.lsp.SignatureInformation>>;
+		getHover(params:object):Promise<dh.lsp.Hover>;
+		closeDocument(params:object):void;
 		/**
-		* Constructs a string for the filter API from the given parameter.
-		* @param input - 
-		* @return 
+		* Creates an empty table with the specified number of rows. Optionally columns and types may be specified, but all
+		* values will be null.
+		* @param size - 
+		* @return {@link Promise} of {@link dh.Table}
 		*/
-		static ofString(input:any):FilterValue;
+		emptyTable(size:number):Promise<Table>;
 		/**
-		* Constructs a boolean for the filter API from the given parameter.
-		* @param b - 
-		* @return 
+		* Creates a new table that ticks automatically every "periodNanos" nanoseconds. A start time may be provided; if so
+		* the table will be populated with the interval from the specified date until now.
+		* @param periodNanos - 
+		* @param startTime - 
+		* @return {@link Promise} of {@link dh.Table}
 		*/
-		static ofBoolean(b:boolean):FilterValue;
+		timeTable(periodNanos:number, startTime?:DateWrapper):Promise<Table>;
+		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<Event<T>>;
+		hasListeners(name:string):boolean;
+		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
 	}
 
-
 	/**
-	* Describes the type of node in a rollup table.
+	* Wrap BigInteger values for use in JS. Provides text formatting for display and access to the underlying value.
 	*/
-	type RollupNodeTypeType = string;
-	export class RollupNodeType {
-		static readonly ROLLUP_NODE_TYPE_AGGREGATED:RollupNodeTypeType;
-		static readonly ROLLUP_NODE_TYPE_CONSTITUENT:RollupNodeTypeType;
-	}
+	export class BigIntegerWrapper {
+		protected constructor();
 
-	type SearchDisplayModeType = string;
-	export class SearchDisplayMode {
-		static readonly SEARCH_DISPLAY_DEFAULT:SearchDisplayModeType;
-		static readonly SEARCH_DISPLAY_HIDE:SearchDisplayModeType;
-		static readonly SEARCH_DISPLAY_SHOW:SearchDisplayModeType;
+		static ofString(str:string):BigIntegerWrapper;
+		asNumber():number;
+		valueOf():string;
+		toString():string;
+		equals(o:object):boolean;
+		hashCode():number;
 	}
 
 	/**
-	* A set of string constants that can be used to describe the different objects the JS API can export.
+	* Exists to keep the dh.TableMap namespace so that the web UI can remain compatible with the DHE API, which still calls
+	* this type TableMap.
+	* @deprecated
 	*/
-	type VariableTypeType = string;
-	export class VariableType {
-		static readonly TABLE:VariableTypeType;
-		static readonly TREETABLE:VariableTypeType;
-		static readonly HIERARCHICALTABLE:VariableTypeType;
-		static readonly TABLEMAP:VariableTypeType;
-		static readonly PARTITIONEDTABLE:VariableTypeType;
-		static readonly FIGURE:VariableTypeType;
-		static readonly OTHERWIDGET:VariableTypeType;
-		static readonly PANDAS:VariableTypeType;
-		static readonly TREEMAP:VariableTypeType;
-	}
+	export class TableMap {
+		static readonly EVENT_KEYADDED:string;
+		static readonly EVENT_DISCONNECT:string;
+		static readonly EVENT_RECONNECT:string;
+		static readonly EVENT_RECONNECTFAILED:string;
 
-	type ValueTypeType = string;
-	export class ValueType {
-		static readonly STRING:ValueTypeType;
-		static readonly NUMBER:ValueTypeType;
-		static readonly DOUBLE:ValueTypeType;
-		static readonly LONG:ValueTypeType;
-		static readonly DATETIME:ValueTypeType;
-		static readonly BOOLEAN:ValueTypeType;
+		protected constructor();
 	}
 
+
 	/**
 	* This enum describes the name of each supported operation/aggregation type when creating a `TreeTable`.
 	*/
@@ -2815,6 +2773,48 @@ export namespace dh {
 		static readonly SKIP:AggregationOperationType;
 	}
 
+	type SearchDisplayModeType = string;
+	export class SearchDisplayMode {
+		static readonly SEARCH_DISPLAY_DEFAULT:SearchDisplayModeType;
+		static readonly SEARCH_DISPLAY_HIDE:SearchDisplayModeType;
+		static readonly SEARCH_DISPLAY_SHOW:SearchDisplayModeType;
+	}
+
+	type ValueTypeType = string;
+	export class ValueType {
+		static readonly STRING:ValueTypeType;
+		static readonly NUMBER:ValueTypeType;
+		static readonly DOUBLE:ValueTypeType;
+		static readonly LONG:ValueTypeType;
+		static readonly DATETIME:ValueTypeType;
+		static readonly BOOLEAN:ValueTypeType;
+	}
+
+	/**
+	* Describes the type of node in a rollup table.
+	*/
+	type RollupNodeTypeType = string;
+	export class RollupNodeType {
+		static readonly ROLLUP_NODE_TYPE_AGGREGATED:RollupNodeTypeType;
+		static readonly ROLLUP_NODE_TYPE_CONSTITUENT:RollupNodeTypeType;
+	}
+
+	/**
+	* A set of string constants that can be used to describe the different objects the JS API can export.
+	*/
+	type VariableTypeType = string;
+	export class VariableType {
+		static readonly TABLE:VariableTypeType;
+		static readonly TREETABLE:VariableTypeType;
+		static readonly HIERARCHICALTABLE:VariableTypeType;
+		static readonly TABLEMAP:VariableTypeType;
+		static readonly PARTITIONEDTABLE:VariableTypeType;
+		static readonly FIGURE:VariableTypeType;
+		static readonly OTHERWIDGET:VariableTypeType;
+		static readonly PANDAS:VariableTypeType;
+		static readonly TREEMAP:VariableTypeType;
+	}
+
 }
 
 export namespace dh.ide {
@@ -2828,21 +2828,6 @@ export namespace dh.ide {
 		name?:string|null;
 	}
 	/**
-	* Indicates the result of code run on the server.
-	*/
-	export interface CommandResult {
-		/**
-		* Describes changes made in the course of this command.
-		* @return {@link dh.ide.VariableChanges}.
-		*/
-		get changes():VariableChanges;
-		/**
-		* If the command failed, the error message will be provided here.
-		* @return String
-		*/
-		get error():string;
-	}
-	/**
 	* A format to describe a variable available to be read from the server. Application fields are optional, and only
 	* populated when a variable is provided by application mode.
 	* <p>
@@ -2884,6 +2869,45 @@ export namespace dh.ide {
 		get applicationName():string;
 	}
 	/**
+	* Describes changes in the current set of variables in the script session. Note that variables that changed value
+	* without changing type will be included as <b>updated</b>, but if a new value with one type replaces an old value with
+	* a different type, this will be included as an entry in both <b>removed</b> and <b>created</b> to indicate the old and
+	* new types.
+	*/
+	export interface VariableChanges {
+		/**
+		* 
+		* @return The variables that no longer exist after this operation, or were replaced by some variable with a
+		*         different type.
+		*/
+		get removed():Array<VariableDefinition>;
+		/**
+		* 
+		* @return The variables that were created by this operation, or have a new type.
+		*/
+		get created():Array<VariableDefinition>;
+		/**
+		* 
+		* @return The variables that changed value during this operation.
+		*/
+		get updated():Array<VariableDefinition>;
+	}
+	/**
+	* Indicates the result of code run on the server.
+	*/
+	export interface CommandResult {
+		/**
+		* Describes changes made in the course of this command.
+		* @return {@link dh.ide.VariableChanges}.
+		*/
+		get changes():VariableChanges;
+		/**
+		* If the command failed, the error message will be provided here.
+		* @return String
+		*/
+		get error():string;
+	}
+	/**
 	* Represents a serialized fishlib LogRecord, suitable for display on javascript clients. A log entry sent from the
 	* server.
 	*/
@@ -2892,41 +2916,91 @@ export namespace dh.ide {
 		* The level of the log message, enabling the client to ignore messages.
 		* @return String
 		*/
-		get logLevel():string;
+		get logLevel():string;
+		/**
+		* Timestamp of the message in microseconds since Jan 1, 1970 UTC.
+		* @return double
+		*/
+		get micros():number;
+		/**
+		* The log message written on the server.
+		* @return String
+		*/
+		get message():string;
+	}
+}
+
+export namespace dh.grpc {
+
+	/**
+	* gRPC transport implementation.
+	*/
+	export interface GrpcTransport {
+		/**
+		* Starts the stream, sending metadata to the server.
+		* @param metadata - the headers to send the server when opening the connection
+		*/
+		start(metadata:{ [key: string]: string|Array<string>; }):void;
+		/**
+		* Sends a message to the server.
+		* @param msgBytes - bytes to send to the server
+		*/
+		sendMessage(msgBytes:Uint8Array):void;
+		/**
+		* "Half close" the stream, signaling to the server that no more messages will be sent, but that the client is still
+		* open to receiving messages.
+		*/
+		finishSend():void;
+		/**
+		* End the stream, both notifying the server that no more messages will be sent nor received, and preventing the
+		* client from receiving any more events.
+		*/
+		cancel():void;
+	}
+	/**
+	* Options for creating a gRPC stream transport instance.
+	*/
+	export interface GrpcTransportOptions {
+		/**
+		* The gRPC method URL.
+		*/
+		url:URL;
+		/**
+		* True to enable debug logging for this stream.
+		*/
+		debug:boolean;
+		/**
+		* Callback for when headers and status are received. The headers are a map of header names to values, and the
+		* status is the HTTP status code. If the connection could not be made, the status should be 0.
+		*/
+		onHeaders:(headers:{ [key: string]: string|Array<string>; },status:number)=>void;
 		/**
-		* Timestamp of the message in microseconds since Jan 1, 1970 UTC.
-		* @return double
+		* Callback for when a chunk of data is received.
 		*/
-		get micros():number;
+		onChunk:(chunk:Uint8Array)=>void;
 		/**
-		* The log message written on the server.
-		* @return String
+		* Callback for when the stream ends, with an error instance if it can be provided. Note that the present
+		* implementation does not consume errors, even if provided.
 		*/
-		get message():string;
+		onEnd:(error?:Error|undefined|null)=>void;
 	}
 	/**
-	* Describes changes in the current set of variables in the script session. Note that variables that changed value
-	* without changing type will be included as <b>updated</b>, but if a new value with one type replaces an old value with
-	* a different type, this will be included as an entry in both <b>removed</b> and <b>created</b> to indicate the old and
-	* new types.
+	* Factory for creating gRPC transports.
 	*/
-	export interface VariableChanges {
-		/**
-		* 
-		* @return The variables that no longer exist after this operation, or were replaced by some variable with a
-		*         different type.
-		*/
-		get removed():Array<VariableDefinition>;
+	export interface GrpcTransportFactory {
 		/**
-		* 
-		* @return The variables that were created by this operation, or have a new type.
+		* Create a new transport instance.
+		* @param options - options for creating the transport
+		* @return a transport instance to use for gRPC communication
 		*/
-		get created():Array<VariableDefinition>;
+		create(options:GrpcTransportOptions):GrpcTransport;
 		/**
-		* 
-		* @return The variables that changed value during this operation.
+		* Return true to signal that created transports may have {@link GrpcTransport.sendMessage} called on it
+		* more than once before {@link GrpcTransport.finishSend} should be called.
+		* @return true to signal that the implementation can stream multiple messages, false otherwise indicating that
+		*         Open/Next gRPC calls should be used
 		*/
-		get updated():Array<VariableDefinition>;
+		get supportsClientStreaming():boolean;
 	}
 }
 
@@ -3197,96 +3271,11 @@ export namespace dh.i18n {
 
 }
 
-export namespace dh.grpc {
-
-	/**
-	* Options for creating a gRPC stream transport instance.
-	*/
-	export interface GrpcTransportOptions {
-		/**
-		* The gRPC method URL.
-		*/
-		url:URL;
-		/**
-		* True to enable debug logging for this stream.
-		*/
-		debug:boolean;
-		/**
-		* Callback for when headers and status are received. The headers are a map of header names to values, and the
-		* status is the HTTP status code. If the connection could not be made, the status should be 0.
-		*/
-		onHeaders:(headers:{ [key: string]: string|Array<string>; },status:number)=>void;
-		/**
-		* Callback for when a chunk of data is received.
-		*/
-		onChunk:(chunk:Uint8Array)=>void;
-		/**
-		* Callback for when the stream ends, with an error instance if it can be provided. Note that the present
-		* implementation does not consume errors, even if provided.
-		*/
-		onEnd:(error?:Error|undefined|null)=>void;
-	}
-	/**
-	* Factory for creating gRPC transports.
-	*/
-	export interface GrpcTransportFactory {
-		/**
-		* Create a new transport instance.
-		* @param options - options for creating the transport
-		* @return a transport instance to use for gRPC communication
-		*/
-		create(options:GrpcTransportOptions):GrpcTransport;
-		/**
-		* Return true to signal that created transports may have {@link GrpcTransport.sendMessage} called on it
-		* more than once before {@link GrpcTransport.finishSend} should be called.
-		* @return true to signal that the implementation can stream multiple messages, false otherwise indicating that
-		*         Open/Next gRPC calls should be used
-		*/
-		get supportsClientStreaming():boolean;
-	}
-	/**
-	* gRPC transport implementation.
-	*/
-	export interface GrpcTransport {
-		/**
-		* Starts the stream, sending metadata to the server.
-		* @param metadata - the headers to send the server when opening the connection
-		*/
-		start(metadata:{ [key: string]: string|Array<string>; }):void;
-		/**
-		* Sends a message to the server.
-		* @param msgBytes - bytes to send to the server
-		*/
-		sendMessage(msgBytes:Uint8Array):void;
-		/**
-		* "Half close" the stream, signaling to the server that no more messages will be sent, but that the client is still
-		* open to receiving messages.
-		*/
-		finishSend():void;
-		/**
-		* End the stream, both notifying the server that no more messages will be sent nor received, and preventing the
-		* client from receiving any more events.
-		*/
-		cancel():void;
-	}
-}
-
 export namespace dh.plot {
 
-	/**
-	* Describes a template that will be used to make new series instances when a new table added to a plotBy.
-	*/
-	export interface MultiSeries {
-		/**
-		* The name for this multi-series.
-		* @return String
-		*/
-		get name():string;
-		/**
-		* The plotting style to use for the series that will be created. See <b>SeriesPlotStyle</b> enum for more details.
-		* @return int
-		*/
-		get plotStyle():SeriesPlotStyleType;
+	export interface FigureDataUpdatedEvent {
+		getArray(series:Series, sourceType:number, mappingFunc?:(arg0:any)=>any):Array<any>;
+		get series():Series[];
 	}
 	/**
 	* Provides access to the data for displaying in a figure.
@@ -3400,6 +3389,27 @@ export namespace dh.plot {
 		get formatType():AxisFormatTypeType;
 		get minRange():number;
 	}
+	export interface OneClick {
+		setValueForColumn(columnName:string, value:any):void;
+		getValueForColumn(columName:string):any;
+		get requireAllFiltersToDisplay():boolean;
+		get columns():dh.Column[];
+	}
+	/**
+	* Describes a template that will be used to make new series instances when a new table added to a plotBy.
+	*/
+	export interface MultiSeries {
+		/**
+		* The name for this multi-series.
+		* @return String
+		*/
+		get name():string;
+		/**
+		* The plotting style to use for the series that will be created. See <b>SeriesPlotStyle</b> enum for more details.
+		* @return int
+		*/
+		get plotStyle():SeriesPlotStyleType;
+	}
 	/**
 	* Describes how to access and display data required within a series.
 	*/
@@ -3420,50 +3430,6 @@ export namespace dh.plot {
 		*/
 		get type():SourceTypeType;
 	}
-	export interface OneClick {
-		setValueForColumn(columnName:string, value:any):void;
-		getValueForColumn(columName:string):any;
-		get requireAllFiltersToDisplay():boolean;
-		get columns():dh.Column[];
-	}
-	export interface FigureDataUpdatedEvent {
-		getArray(series:Series, sourceType:number, mappingFunc?:(arg0:any)=>any):Array<any>;
-		get series():Series[];
-	}
-
-	export class ChartDescriptor {
-		colspan?:number|null;
-		rowspan?:number|null;
-		series:Array<SeriesDescriptor>;
-		axes:Array<AxisDescriptor>;
-		chartType:string;
-		title?:string|null;
-		titleFont?:string|null;
-		titleColor?:string|null;
-		showLegend?:boolean|null;
-		legendFont?:string|null;
-		legendColor?:string|null;
-		is3d?:boolean|null;
-
-		constructor();
-	}
-
-	/**
-	* A descriptor used with JsFigureFactory.create to create a figure from JS.
-	*/
-	export class FigureDescriptor {
-		title?:string|null;
-		titleFont?:string|null;
-		titleColor?:string|null;
-		isResizable?:boolean|null;
-		isDefaultTheme?:boolean|null;
-		updateInterval?:number|null;
-		cols?:number|null;
-		rows?:number|null;
-		charts:Array<ChartDescriptor>;
-
-		constructor();
-	}
 
 	/**
 	* Provides the details for a figure.
@@ -3585,62 +3551,63 @@ export namespace dh.plot {
 		static create(config:FigureDescriptor):Promise<Figure>;
 	}
 
-	export class FigureSourceException {
-		table:dh.Table;
-		source:SeriesDataSource;
-
+	export class SeriesDataSourceException {
 		protected constructor();
+
+		get source():SeriesDataSource;
+		get message():string;
 	}
 
-	export class FigureFetchError {
-		error:object;
-		errors:Array<string>;
+	export class FigureSourceException {
+		table:dh.Table;
+		source:SeriesDataSource;
 
 		protected constructor();
 	}
 
 	/**
-	* Provide the details for a chart.
+	* Helper class for plot downsampling methods.
 	*/
-	export class Chart implements dh.HasEventHandling {
-		/**
-		* a new series was added to this chart as part of a multi-series. The series instance is the detail for this event.
-		*/
-		static readonly EVENT_SERIES_ADDED:string;
+	export class Downsample {
+		protected constructor();
+
 		/**
-		* The title of the chart.
-		* @return String
+		* Downsamples a table so that the data can be used for a time-series line plot. The downsampled table should have
+		* the same visual fidelity as the original table, but with fewer rows.
+		* @param table - The table to downsample.
+		* @param xCol - The name of the X column to downsample. Must be an Instant or long.
+		* @param yCols - The names of the Y columns to downsample.
+		* @param width - The width of the visible area in pixels.
+		* @param xRange - The visible range as `[start, end]` or null to always use all data.
+		* @return A promise that resolves to the downsampled table.
 		*/
-		readonly title?:string|null;
+		static runChartDownsample(table:dh.Table, xCol:string, yCols:string[], width:number, xRange?:dh.LongWrapper[]|undefined|null):Promise<dh.Table>;
+	}
 
-		protected constructor();
+	export class SourceDescriptor {
+		axis:AxisDescriptor;
+		table:dh.Table;
+		columnName:string;
+		type:string;
+
+		constructor();
+	}
+
+	/**
+	* A descriptor used with JsFigureFactory.create to create a figure from JS.
+	*/
+	export class FigureDescriptor {
+		title?:string|null;
+		titleFont?:string|null;
+		titleColor?:string|null;
+		isResizable?:boolean|null;
+		isDefaultTheme?:boolean|null;
+		updateInterval?:number|null;
+		cols?:number|null;
+		rows?:number|null;
+		charts:Array<ChartDescriptor>;
 
-		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<dh.Event<T>>;
-		hasListeners(name:string):boolean;
-		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
-		get column():number;
-		get showLegend():boolean;
-		/**
-		* The axes used in this chart.
-		* @return dh.plot.Axis
-		*/
-		get axes():Axis[];
-		get is3d():boolean;
-		get titleFont():string;
-		get colspan():number;
-		get titleColor():string;
-		get series():Series[];
-		get rowspan():number;
-		/**
-		* The type of this chart, see <b>ChartType</b> enum for more details.
-		* @return int
-		*/
-		get chartType():ChartTypeType;
-		get row():number;
-		get legendColor():string;
-		get legendFont():string;
-		get multiSeries():MultiSeries[];
+		constructor();
 	}
 
 	export class DownsampleOptions {
@@ -3693,41 +3660,23 @@ export namespace dh.plot {
 		constructor();
 	}
 
-	export class SeriesDataSourceException {
-		protected constructor();
-
-		get source():SeriesDataSource;
-		get message():string;
-	}
-
-	export class SourceDescriptor {
-		axis:AxisDescriptor;
-		table:dh.Table;
-		columnName:string;
-		type:string;
+	export class ChartDescriptor {
+		colspan?:number|null;
+		rowspan?:number|null;
+		series:Array<SeriesDescriptor>;
+		axes:Array<AxisDescriptor>;
+		chartType:string;
+		title?:string|null;
+		titleFont?:string|null;
+		titleColor?:string|null;
+		showLegend?:boolean|null;
+		legendFont?:string|null;
+		legendColor?:string|null;
+		is3d?:boolean|null;
 
 		constructor();
 	}
 
-	/**
-	* Helper class for plot downsampling methods.
-	*/
-	export class Downsample {
-		protected constructor();
-
-		/**
-		* Downsamples a table so that the data can be used for a time-series line plot. The downsampled table should have
-		* the same visual fidelity as the original table, but with fewer rows.
-		* @param table - The table to downsample.
-		* @param xCol - The name of the X column to downsample. Must be an Instant or long.
-		* @param yCols - The names of the Y columns to downsample.
-		* @param width - The width of the visible area in pixels.
-		* @param xRange - The visible range as `[start, end]` or null to always use all data.
-		* @return A promise that resolves to the downsampled table.
-		*/
-		static runChartDownsample(table:dh.Table, xCol:string, yCols:string[], width:number, xRange?:dh.LongWrapper[]|undefined|null):Promise<dh.Table>;
-	}
-
 	export class SeriesDescriptor {
 		plotStyle:string;
 		name?:string|null;
@@ -3747,6 +3696,13 @@ export namespace dh.plot {
 		constructor();
 	}
 
+	export class FigureFetchError {
+		error:object;
+		errors:Array<string>;
+
+		protected constructor();
+	}
+
 	/**
 	* Helper class to manage snapshots and deltas and keep not only a contiguous JS array of data per column in the
 	* underlying table, but also support a mapping function to let client code translate data in some way for display and
@@ -3764,23 +3720,51 @@ export namespace dh.plot {
 		removeColumn(columnName:string, mappingFunc:(arg0:any)=>any):void;
 	}
 
+	/**
+	* Provide the details for a chart.
+	*/
+	export class Chart implements dh.HasEventHandling {
+		/**
+		* a new series was added to this chart as part of a multi-series. The series instance is the detail for this event.
+		*/
+		static readonly EVENT_SERIES_ADDED:string;
+		/**
+		* The title of the chart.
+		* @return String
+		*/
+		readonly title?:string|null;
 
-	type AxisTypeType = number;
-	export class AxisType {
-		static readonly X:AxisTypeType;
-		static readonly Y:AxisTypeType;
-		static readonly SHAPE:AxisTypeType;
-		static readonly SIZE:AxisTypeType;
-		static readonly LABEL:AxisTypeType;
-		static readonly COLOR:AxisTypeType;
-	}
+		protected constructor();
 
-	type AxisFormatTypeType = number;
-	export class AxisFormatType {
-		static readonly CATEGORY:AxisFormatTypeType;
-		static readonly NUMBER:AxisFormatTypeType;
+		addEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<dh.Event<T>>;
+		hasListeners(name:string):boolean;
+		removeEventListener<T>(name:string, callback:(e:dh.Event<T>)=>void):boolean;
+		get column():number;
+		get showLegend():boolean;
+		/**
+		* The axes used in this chart.
+		* @return dh.plot.Axis
+		*/
+		get axes():Axis[];
+		get is3d():boolean;
+		get titleFont():string;
+		get colspan():number;
+		get titleColor():string;
+		get series():Series[];
+		get rowspan():number;
+		/**
+		* The type of this chart, see <b>ChartType</b> enum for more details.
+		* @return int
+		*/
+		get chartType():ChartTypeType;
+		get row():number;
+		get legendColor():string;
+		get legendFont():string;
+		get multiSeries():MultiSeries[];
 	}
 
+
 	type SeriesPlotStyleType = number;
 	export class SeriesPlotStyle {
 		static readonly BAR:SeriesPlotStyleType;
@@ -3826,13 +3810,20 @@ export namespace dh.plot {
 		static readonly HOVER_TEXT:SourceTypeType;
 	}
 
-	type AxisPositionType = number;
-	export class AxisPosition {
-		static readonly TOP:AxisPositionType;
-		static readonly BOTTOM:AxisPositionType;
-		static readonly LEFT:AxisPositionType;
-		static readonly RIGHT:AxisPositionType;
-		static readonly NONE:AxisPositionType;
+	type AxisTypeType = number;
+	export class AxisType {
+		static readonly X:AxisTypeType;
+		static readonly Y:AxisTypeType;
+		static readonly SHAPE:AxisTypeType;
+		static readonly SIZE:AxisTypeType;
+		static readonly LABEL:AxisTypeType;
+		static readonly COLOR:AxisTypeType;
+	}
+
+	type AxisFormatTypeType = number;
+	export class AxisFormatType {
+		static readonly CATEGORY:AxisFormatTypeType;
+		static readonly NUMBER:AxisFormatTypeType;
 	}
 
 	/**
@@ -3850,28 +3841,48 @@ export namespace dh.plot {
 		static readonly TREEMAP:ChartTypeType;
 	}
 
+	type AxisPositionType = number;
+	export class AxisPosition {
+		static readonly TOP:AxisPositionType;
+		static readonly BOTTOM:AxisPositionType;
+		static readonly LEFT:AxisPositionType;
+		static readonly RIGHT:AxisPositionType;
+		static readonly NONE:AxisPositionType;
+	}
+
 }
 
 export namespace dh.lsp {
 
-	export class Position {
-		line:number;
-		character:number;
+	export class CompletionItem {
+		label:string;
+		kind:number;
+		detail:string;
+		documentation:MarkupContent;
+		deprecated:boolean;
+		preselect:boolean;
+		textEdit:TextEdit;
+		sortText:string;
+		filterText:string;
+		insertTextFormat:number;
+		additionalTextEdits:Array<TextEdit>;
+		commitCharacters:Array<string>;
 
 		constructor();
+	}
 
-		lessThan(start:Position):boolean;
-		lessOrEqual(start:Position):boolean;
-		greaterThan(end:Position):boolean;
-		greaterOrEqual(end:Position):boolean;
-		copy():Position;
+	export class Range {
+		start:Position;
+		end:Position;
+
+		constructor();
+
+		isInside(innerStart:Position, innerEnd:Position):boolean;
 	}
 
-	export class SignatureInformation {
-		label:string;
-		documentation:MarkupContent;
-		parameters:Array<ParameterInformation>;
-		activeParameter:number;
+	export class Hover {
+		contents:MarkupContent;
+		range:Range;
 
 		constructor();
 	}
@@ -3883,42 +3894,32 @@ export namespace dh.lsp {
 		constructor();
 	}
 
-	export class Range {
-		start:Position;
-		end:Position;
+	export class Position {
+		line:number;
+		character:number;
 
 		constructor();
 
-		isInside(innerStart:Position, innerEnd:Position):boolean;
+		lessThan(start:Position):boolean;
+		lessOrEqual(start:Position):boolean;
+		greaterThan(end:Position):boolean;
+		greaterOrEqual(end:Position):boolean;
+		copy():Position;
 	}
 
-	export class CompletionItem {
-		label:string;
-		kind:number;
-		detail:string;
-		documentation:MarkupContent;
-		deprecated:boolean;
-		preselect:boolean;
-		textEdit:TextEdit;
-		sortText:string;
-		filterText:string;
-		insertTextFormat:number;
-		additionalTextEdits:Array<TextEdit>;
-		commitCharacters:Array<string>;
+	export class TextDocumentContentChangeEvent {
+		range:Range;
+		rangeLength:number;
+		text:string;
 
 		constructor();
 	}
 
-	export class ParameterInformation {
+	export class SignatureInformation {
 		label:string;
 		documentation:MarkupContent;
-
-		constructor();
-	}
-
-	export class Hover {
-		contents:MarkupContent;
-		range:Range;
+		parameters:Array<ParameterInformation>;
+		activeParameter:number;
 
 		constructor();
 	}
@@ -3930,10 +3931,9 @@ export namespace dh.lsp {
 		constructor();
 	}
 
-	export class TextDocumentContentChangeEvent {
-		range:Range;
-		rangeLength:number;
-		text:string;
+	export class ParameterInformation {
+		label:string;
+		documentation:MarkupContent;
 
 		constructor();
 	}
@@ -3955,10 +3955,6 @@ export namespace dh.calendar {
 		*/
 		get businessPeriods():Array<BusinessPeriod>;
 	}
-	export interface BusinessPeriod {
-		get close():string;
-		get open():string;
-	}
 	/**
 	* Defines a calendar with business hours and holidays.
 	*/
@@ -3989,6 +3985,10 @@ export namespace dh.calendar {
 		*/
 		get businessPeriods():Array<BusinessPeriod>;
 	}
+	export interface BusinessPeriod {
+		get close():string;
+		get open():string;
+	}
 
 	type DayOfWeekType = string;
 	export class DayOfWeek {