@deephaven/jsapi-types 1.0.0-dev0.35.2 → 1.0.0-dev0.35.3

package/dist/index.d.ts

@@ -1,10 +1,6 @@
 // Minimum TypeScript Version: 4.3
 // Generated using com.vertispan.tsdefs.doclet.TsDoclet
 
-export interface IIterableResult<T> {
-	value:T;
-	done:boolean;
-}
 /**
 * This is part of EcmaScript 2015, documented here for completeness. It supports a single method, <b>next()</b>, which
 * returns an object with a <b>boolean</b> named <b>done</b> (true if there are no more items to return; false
@@ -15,6 +11,10 @@ export interface Iterator<T> {
 	hasNext():boolean;
 	next():IIterableResult<T>;
 }
+export interface IIterableResult<T> {
+	value:T;
+	done:boolean;
+}
 export namespace dh.storage {
 
 	/**
@@ -117,62 +117,86 @@ export namespace dh.storage {
 
 export namespace dh {
 
+	export interface ColumnGroup {
+		get name():string|null;
+		get children():string[]|null;
+		get color():string|null;
+	}
 	/**
-	* Row implementation that also provides additional read-only properties. represents visible rows in the table,
-	* but with additional properties to reflect the tree structure.
+	* Javascript wrapper for {@link io.deephaven.web.shared.data.ColumnStatistics} This class holds the results of a call to generate statistics on a
+	* table column.
 	*/
-	export interface TreeRow extends ViewportRow {
+	export interface ColumnStatistics {
 		/**
-		* True if this node is currently expanded to show its children; false otherwise. Those children will be the
-		* rows below this one with a greater depth than this one
-		* @return boolean
+		* 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
 		*/
-		get isExpanded():boolean;
+		getType(name:string):string;
 		/**
-		* The number of levels above this node; zero for top level nodes. Generally used by the UI to indent the
-		* row and its expand/collapse icon
-		* @return int
+		* 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
 		*/
-		get depth():number;
+		get uniqueValues():Map<string, number>;
 		/**
-		* True if this node has children and can be expanded; false otherwise. Note that this value may change when
-		* the table updates, depending on the table's configuration
-		* @return 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
 		*/
-		get hasChildren():boolean;
-		get index():LongWrapper;
+		get statisticsMap():Map<string, object>;
 	}
 	/**
-	* 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.
+	* 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;
+	}
+	/**
+	* 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.
 	*
-	* 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.
+	* 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.
+	*
+	* 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 WidgetMessageDetails {
-		/**
-		* Returns the data from this message as a base64-encoded string.
-		*/
-		getDataAsBase64():string;
+	export interface SubscriptionTableData extends TableData {
+		get fullIndex():RangeSet;
 		/**
-		* Returns the data from this message as a Uint8Array.
+		* The ordered set of row indexes removed since the last update
+		* @return dh.RangeSet
 		*/
-		getDataAsU8():Uint8Array;
+		get removed():RangeSet;
 		/**
-		* Returns the data from this message as a utf-8 string.
+		* The ordered set of row indexes added since the last update
+		* @return dh.RangeSet
 		*/
-		getDataAsString():string;
+		get added():RangeSet;
+		get columns():Array<Column>;
 		/**
-		* 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.
+		* The ordered set of row indexes updated since the last update
+		* @return dh.RangeSet
 		*/
-		get exportedObjects():WidgetExportedObject[];
+		get modified():RangeSet;
+		get rows():Array<Row>;
 	}
-	export interface Row {
-		get(column:Column):any;
-		getFormat(column:Column):Format;
-		get index():LongWrapper;
+	export interface RefreshToken {
+		get bytes():string;
+		get expiry():number;
 	}
 	export interface LayoutHints {
 		readonly searchDisplayMode?:SearchDisplayModeType|null;
@@ -185,26 +209,93 @@ export namespace dh {
 		get backColumns():string[]|null;
 	}
 	/**
-	* Contains data in the current viewport. Also contains the offset to this data, so that the actual row number may be
-	* determined. 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.
+	* Represents a table which can be joined to another table. Current implementations are {@link dh.Table} and
+	* {@link dh.TotalsTable}.
 	*/
-	export interface ViewportData extends TableData {
+	export interface JoinableTable {
+		freeze():Promise<Table>;
+		snapshot(baseTable:Table, doInitialSnapshot?:boolean, stampColumns?:string[]):Promise<Table>;
 		/**
-		* The index of the first returned row
-		* @return double
+		* 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
 		*/
-		get offset():number;
+		join(joinType:string, rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
 		/**
-		* A list of columns describing the data types in each row
-		* @return {@link dh.Column} array.
+		* 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
 		*/
-		get columns():Array<Column>;
+		asOfJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
 		/**
-		* An array of rows of data
-		* @return {@link dh.ViewportRow} array.
+		* 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
 		*/
-		get rows():Array<ViewportRow>;
+		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
@@ -336,225 +427,142 @@ export namespace dh {
 		get isRefreshing():boolean;
 	}
 	/**
-	* Common interface for various ways of accessing table data and formatting.
-	*
-	* Java note: this interface contains some extra overloads that aren't available in JS. Implementations are expected to
-	* implement only abstract methods, and default methods present in this interface will dispatch accordingly.
-	*/
-	export interface TableData {
-		get(index:LongWrapper|number):Row;
-		getData(index:LongWrapper|number, column:Column):any;
-		getFormat(index:LongWrapper|number, column:Column):Format;
-		get columns():Array<Column>;
-		get rows():Array<Row>;
-	}
-	/**
-	* Encapsulates event handling around table subscriptions by "cheating" and wrapping up a JsTable instance to do the
-	* real dirty work. This allows a viewport to stay open on the old table if desired, while this one remains open.
-	* <p>
-	* As this just wraps a JsTable (and thus a CTS), it holds its own flattened, pUT'd handle to get deltas from the
-	* server. The setViewport method can be used to adjust this table instead of creating a new one.
-	* <p>
-	* Existing methods on JsTable like setViewport and getViewportData are intended to proxy to this, which then will talk
-	* to the underlying handle and accumulated data.
-	* <p>
-	* As long as we keep the existing methods/events on JsTable, close() is not required if no other method is called, with
-	* the idea then that the caller did not actually use this type. This means that for every exported method (which then
-	* will mark the instance of "actually being used, please don't automatically close me"), there must be an internal
-	* version called by those existing JsTable method, which will allow this instance to be cleaned up once the JsTable
-	* deems it no longer in use.
-	* <p>
-	* Note that if the caller does close an instance, this shuts down the JsTable's use of this (while the converse is not
-	* true), providing a way to stop the server from streaming updates to the client.
-	*
-	* 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.
+	* Represents a server-side object that may not yet have been fetched by the client. When this object will no longer be
+	* used, if {@link fetch} is not called on this object, then {@link close} must be to ensure server-side resources
+	* are correctly freed.
 	*/
-	export interface TableViewportSubscription extends HasEventHandling {
+	export interface WidgetExportedObject {
 		/**
-		* 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 - 
+		* Returns the type of this export, typically one of {@link dh.VariableType}, but may also include plugin types. If
+		* null, this object cannot be fetched, but can be passed to the server, such as via
+		* {@link Widget.sendMessage}.
+		* @return the string type of this server-side object, or null.
 		*/
-		setViewport(firstRow:number, lastRow:number, columns?:Column[]|undefined|null, updateIntervalMs?:number|undefined|null):void;
+		readonly type?:string|null;
+
 		/**
-		* Stops this viewport from running, stopping all events on itself and on the table that created it.
+		* Exports another copy of this reference, allowing it to be fetched separately. Results in rejection if the ticket
+		* was already closed (either by calling {@link WidgetExportedObject.close} or closing the object returned from {@link WidgetExportedObject.fetch}).
+		* @return a promise returning a reexported copy of this object, still referencing the same server-side object.
+		*/
+		reexport():Promise<WidgetExportedObject>;
+		/**
+		* Returns a promise that will fetch the object represented by this reference. Multiple calls to this will return
+		* the same instance.
+		* @return a promise that will resolve to a client side object that represents the reference on the server.
+		*/
+		fetch():Promise<any>;
+		/**
+		* Releases the server-side resources associated with this object, regardless of whether other client-side objects
+		* exist that also use that object. Should not be called after fetch() has been invoked.
 		*/
 		close():void;
+	}
+	export interface WorkerHeapInfo {
 		/**
-		* Gets the data currently visible in this viewport
-		* @return Promise of {@link dh.TableData}.
+		* Total heap size available for this worker.
 		*/
-		getViewportData():Promise<TableData>;
-		snapshot(rows:RangeSet, columns:Column[]):Promise<TableData>;
+		get totalHeapSize():number;
+		get freeMemory():number;
+		get maximumHeapSize():number;
 	}
 	/**
-	* This object may be pooled internally or discarded and not updated. Do not retain references to it.
+	* 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 Format {
+	export interface WidgetMessageDetails {
 		/**
-		* The format string to apply to the value of this cell.
-		* @return String
+		* Returns the data from this message as a base64-encoded string.
 		*/
-		readonly formatString?:string|null;
+		getDataAsBase64():string;
 		/**
-		* Color to apply to the cell's background, in <b>#rrggbb</b> format.
-		* @return String
+		* Returns the data from this message as a Uint8Array.
 		*/
-		readonly backgroundColor?:string|null;
+		getDataAsU8():Uint8Array;
 		/**
-		* Color to apply to the text, in <b>#rrggbb</b> format.
-		* @return String
+		* Returns the data from this message as a utf-8 string.
 		*/
-		readonly color?:string|null;
+		getDataAsString():string;
 		/**
-		* 
-		* @deprecated Prefer formatString. Number format string to apply to the value in this cell.
+		* 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.
 		*/
-		readonly numberFormat?:string|null;
-	}
-	/**
-	* 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;
+		get exportedObjects():WidgetExportedObject[];
 	}
 	/**
-	* Javascript wrapper for {@link io.deephaven.web.shared.data.ColumnStatistics} This class holds the results of a call to generate statistics on a
-	* table column.
+	* Contains data in the current viewport. Also contains the offset to this data, so that the actual row number may be
+	* determined. 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 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;
+	export interface ViewportData extends TableData {
 		/**
-		* 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
+		* The index of the first returned row
+		* @return double
 		*/
-		get uniqueValues():Map<string, number>;
+		get offset():number;
 		/**
-		* 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
+		* A list of columns describing the data types in each row
+		* @return {@link dh.Column} array.
 		*/
-		get statisticsMap():Map<string, object>;
-	}
-	export interface ColumnGroup {
-		get name():string|null;
-		get children():string[]|null;
-		get color():string|null;
-	}
-	export interface WorkerHeapInfo {
+		get columns():Array<Column>;
 		/**
-		* Total heap size available for this worker.
+		* An array of rows of data
+		* @return {@link dh.ViewportRow} array.
 		*/
-		get totalHeapSize():number;
-		get freeMemory():number;
-		get maximumHeapSize():number;
-	}
-	export interface RefreshToken {
-		get bytes():string;
-		get expiry():number;
+		get rows():Array<ViewportRow>;
 	}
 	/**
-	* Wrap LocalDate values for use in JS. Provides text formatting for display and access to the underlying value.
+	* Common interface for various ways of accessing table data and formatting.
+	*
+	* Java note: this interface contains some extra overloads that aren't available in JS. Implementations are expected to
+	* implement only abstract methods, and default methods present in this interface will dispatch accordingly.
 	*/
-	export interface LocalDateWrapper {
-		valueOf():string;
-		getYear():number;
-		getMonthValue():number;
-		getDayOfMonth():number;
-		toString():string;
+	export interface TableData {
+		get(index:LongWrapper|number):Row;
+		getData(index:LongWrapper|number, column:Column):any;
+		getFormat(index:LongWrapper|number, column:Column):Format;
+		get columns():Array<Column>;
+		get rows():Array<Row>;
 	}
 	/**
-	* Represents a server-side object that may not yet have been fetched by the client. When this object will no longer be
-	* used, if {@link fetch} is not called on this object, then {@link close} must be to ensure server-side resources
-	* are correctly freed.
+	* This object may be pooled internally or discarded and not updated. Do not retain references to it.
 	*/
-	export interface WidgetExportedObject {
+	export interface Format {
 		/**
-		* Returns the type of this export, typically one of {@link dh.VariableType}, but may also include plugin types. If
-		* null, this object cannot be fetched, but can be passed to the server, such as via
-		* {@link Widget.sendMessage}.
-		* @return the string type of this server-side object, or null.
+		* The format string to apply to the value of this cell.
+		* @return String
 		*/
-		readonly type?:string|null;
-
+		readonly formatString?:string|null;
 		/**
-		* Exports another copy of this reference, allowing it to be fetched separately. Results in rejection if the ticket
-		* was already closed (either by calling {@link WidgetExportedObject.close} or closing the object returned from {@link WidgetExportedObject.fetch}).
-		* @return a promise returning a reexported copy of this object, still referencing the same server-side object.
+		* Color to apply to the cell's background, in <b>#rrggbb</b> format.
+		* @return String
 		*/
-		reexport():Promise<WidgetExportedObject>;
+		readonly backgroundColor?:string|null;
 		/**
-		* Returns a promise that will fetch the object represented by this reference. Multiple calls to this will return
-		* the same instance.
-		* @return a promise that will resolve to a client side object that represents the reference on the server.
+		* Color to apply to the text, in <b>#rrggbb</b> format.
+		* @return String
 		*/
-		fetch():Promise<any>;
+		readonly color?:string|null;
 		/**
-		* Releases the server-side resources associated with this object, regardless of whether other client-side objects
-		* exist that also use that object. Should not be called after fetch() has been invoked.
+		* 
+		* @deprecated Prefer formatString. Number format string to apply to the value in this cell.
 		*/
-		close():void;
+		readonly numberFormat?:string|null;
+	}
+	export interface Row {
+		get(column:Column):any;
+		getFormat(column:Column):Format;
+		get index():LongWrapper;
 	}
 	export interface TreeViewportData extends TableData {
 		get offset():number;
 		get columns():Array<Column>;
 		get rows():Array<TreeRow>;
 	}
-	/**
-	* 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.
-	*
-	* 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.
-	*
-	* 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 dh.RangeSet
-		*/
-		get removed():RangeSet;
-		/**
-		* The ordered set of row indexes added since the last update
-		* @return dh.RangeSet
-		*/
-		get added():RangeSet;
-		get columns():Array<Column>;
-		/**
-		* The ordered set of row indexes updated since the last update
-		* @return dh.RangeSet
-		*/
-		get modified():RangeSet;
-		get rows():Array<Row>;
-	}
 	export interface HasEventHandling {
 		/**
 		* Listen for events on this object.
@@ -583,337 +591,183 @@ export namespace dh {
 		get index():LongWrapper;
 	}
 	/**
-	* Represents a table which can be joined to another table. Current implementations are {@link dh.Table} and
-	* {@link dh.TotalsTable}.
+	* Encapsulates event handling around table subscriptions by "cheating" and wrapping up a JsTable instance to do the
+	* real dirty work. This allows a viewport to stay open on the old table if desired, while this one remains open.
+	* <p>
+	* As this just wraps a JsTable (and thus a CTS), it holds its own flattened, pUT'd handle to get deltas from the
+	* server. The setViewport method can be used to adjust this table instead of creating a new one.
+	* <p>
+	* Existing methods on JsTable like setViewport and getViewportData are intended to proxy to this, which then will talk
+	* to the underlying handle and accumulated data.
+	* <p>
+	* As long as we keep the existing methods/events on JsTable, close() is not required if no other method is called, with
+	* the idea then that the caller did not actually use this type. This means that for every exported method (which then
+	* will mark the instance of "actually being used, please don't automatically close me"), there must be an internal
+	* version called by those existing JsTable method, which will allow this instance to be cleaned up once the JsTable
+	* deems it no longer in use.
+	* <p>
+	* Note that if the caller does close an instance, this shuts down the JsTable's use of this (while the converse is not
+	* true), providing a way to stop the server from streaming updates to the client.
+	*
+	* 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 interface JoinableTable {
-		freeze():Promise<Table>;
-		snapshot(baseTable:Table, doInitialSnapshot?:boolean, stampColumns?:string[]):Promise<Table>;
+	export interface TableViewportSubscription extends HasEventHandling {
 		/**
-		* 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>;
+		* 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 - 
+		*/
+		setViewport(firstRow:number, lastRow:number, columns?:Column[]|undefined|null, updateIntervalMs?:number|undefined|null):void;
 		/**
-		* 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
+		* Stops this viewport from running, stopping all events on itself and on the table that created it.
 		*/
-		asOfJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
+		close():void;
 		/**
-		* 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
+		* Gets the data currently visible in this viewport
+		* @return Promise of {@link dh.TableData}.
 		*/
-		crossJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, reserveBits?:number|undefined|null):Promise<Table>;
+		getViewportData():Promise<TableData>;
+		snapshot(rows:RangeSet, columns:Column[]):Promise<TableData>;
+	}
+	/**
+	* Row implementation that also provides additional read-only properties. represents visible rows in the table,
+	* but with additional properties to reflect the tree structure.
+	*/
+	export interface TreeRow extends ViewportRow {
 		/**
-		* 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
+		* True if this node is currently expanded to show its children; false otherwise. Those children will be the
+		* rows below this one with a greater depth than this one
+		* @return boolean
 		*/
-		exactJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null):Promise<Table>;
+		get isExpanded():boolean;
 		/**
-		* 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
+		* The number of levels above this node; zero for top level nodes. Generally used by the UI to indent the
+		* row and its expand/collapse icon
+		* @return int
 		*/
-		naturalJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null):Promise<Table>;
+		get depth():number;
+		/**
+		* True if this node has children and can be expanded; false otherwise. Note that this value may change when
+		* the table updates, depending on the table's configuration
+		* @return boolean
+		*/
+		get hasChildren():boolean;
+		get index():LongWrapper;
 	}
-
 	/**
-	* Event fired when a command is issued from the client.
+	* Wrap LocalTime values for use in JS. Provides text formatting for display and access to the underlying value.
 	*/
-	export class CommandInfo {
-		constructor(code:string, result:Promise<dh.ide.CommandResult>);
-
-		get result():Promise<dh.ide.CommandResult>;
-		get code():string;
+	export interface LocalTimeWrapper {
+		valueOf():string;
+		getHour():number;
+		getMinute():number;
+		getSecond():number;
+		getNano():number;
+		toString():string;
 	}
 
 	/**
-	* Deprecated for use in Deephaven Core.
-	* @deprecated
+	* 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 Client {
-		static readonly EVENT_REQUEST_FAILED:string;
-		static readonly EVENT_REQUEST_STARTED:string;
-		static readonly EVENT_REQUEST_SUCCEEDED:string;
-
-		constructor();
-	}
-
-	export class Ide {
-		constructor();
-
+	export class TotalsTableConfig {
 		/**
 		* @deprecated
 		*/
-		getExistingSession(websocketUrl:string, authToken:string, serviceId:string, language:string):Promise<IdeSession>;
+		static readonly COUNT:string;
 		/**
 		* @deprecated
 		*/
-		static getExistingSession(websocketUrl:string, authToken:string, serviceId:string, language:string):Promise<IdeSession>;
-	}
-
-	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 readonly MIN:string;
 		/**
-		* The expression to evaluate this custom column.
-		* @return String
+		* @deprecated
 		*/
-		get expression():string;
+		static readonly MAX:string;
 		/**
-		* The name of the column to use.
-		* @return String
+		* @deprecated
 		*/
-		get name():string;
+		static readonly SUM:string;
 		/**
-		* 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
+		* @deprecated
 		*/
-		get type():string;
-	}
-
-	/**
-	* 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.
-	*
-	* 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.
-	*
-	* 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 TableSubscription implements HasEventHandling {
+		static readonly ABS_SUM:string;
 		/**
-		* Indicates that some new data is available on the client, either an initial snapshot or a delta update. The
-		* <b>detail</b> field of the event will contain a TableSubscriptionEventData detailing what has changed, or
-		* allowing access to the entire range of items currently in the subscribed columns.
+		* @deprecated
 		*/
-		static readonly EVENT_UPDATED:string;
-
-		protected constructor();
-
+		static readonly VAR:string;
 		/**
-		* Stops the subscription on the server.
+		* @deprecated
 		*/
-		close():void;
-		addEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
-		hasListeners(name:string):boolean;
-		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
+		static readonly AVG:string;
 		/**
-		* The columns that were subscribed to when this subscription was created
-		* @return {@link dh.Column}
+		* @deprecated
 		*/
-		get columns():Array<Column>;
-	}
-
-	/**
-	* 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();
-
+		static readonly STD:string;
 		/**
-		* 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
+		* @deprecated
 		*/
-		addRow(row:{ [key: string]: any; }, userTimeZone?:string):Promise<InputTable>;
+		static readonly FIRST:string;
 		/**
-		* Add multiple rows to a table.
-		* @param rows - 
-		* @param userTimeZone - 
-		* @return Promise of dh.InputTable
+		* @deprecated
 		*/
-		addRows(rows:{ [key: string]: any; }[], userTimeZone?:string):Promise<InputTable>;
+		static readonly LAST:string;
 		/**
-		* 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
+		* @deprecated
 		*/
-		addTable(tableToAdd:Table):Promise<InputTable>;
+		static readonly SKIP:string;
 		/**
-		* Add multiple tables to this Input Table.
-		* @param tablesToAdd - 
-		* @return Promise of dh.InputTable
+		* Specifies if a Totals Table should be expanded by default in the UI. Defaults to false.
 		*/
-		addTables(tablesToAdd:Table[]):Promise<InputTable>;
+		showTotalsByDefault:boolean;
 		/**
-		* Deletes an entire table from this Input Table. Key columns must match the Input Table.
-		* @param tableToDelete - 
-		* @return Promise of dh.InputTable
+		* Specifies if a Grand Totals Table should be expanded by default in the UI. Defaults to false.
 		*/
-		deleteTable(tableToDelete:Table):Promise<InputTable>;
+		showGrandTotalsByDefault:boolean;
 		/**
-		* Delete multiple tables from this Input Table.
-		* @param tablesToDelete - 
-		* @return 
+		* Specifies the default operation for columns that do not have a specific operation applied; defaults to "Sum".
 		*/
-		deleteTables(tablesToDelete:Table[]):Promise<InputTable>;
+		defaultOperation:AggregationOperationType;
 		/**
-		* 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.
+		* 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.
 		*/
-		get valueColumns():Column[];
+		operationMap:{ [key: string]: Array<AggregationOperationType>; };
 		/**
-		* The source table for this Input Table
-		* @return dh.table
+		* 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`.
 		*/
-		get table():Table;
-	}
+		groupBy:Array<string>;
 
-	export class QueryInfo {
-		static readonly EVENT_TABLE_OPENED:string;
-		static readonly EVENT_DISCONNECT:string;
-		static readonly EVENT_RECONNECT:string;
-		static readonly EVENT_CONNECT:string;
+		constructor();
 
-		protected constructor();
+		toString():string;
 	}
 
-	export class CoreClient implements HasEventHandling {
-		static readonly EVENT_CONNECT:string;
+	/**
+	* 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_RECONNECT_AUTH_FAILED:string;
-		static readonly EVENT_REFRESH_TOKEN_UPDATED:string;
-		static readonly EVENT_REQUEST_FAILED:string;
-		static readonly EVENT_REQUEST_STARTED:string;
-		static readonly EVENT_REQUEST_SUCCEEDED: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:CustomEvent<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
-		hasListeners(name:string):boolean;
-		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
-	}
+		static readonly EVENT_RECONNECTFAILED:string;
 
-	/**
-	* 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;
 	}
 
 	export class DateWrapper extends LongWrapper {
@@ -924,133 +778,322 @@ export namespace dh {
 	}
 
 	/**
-	* Wrap BigInteger values for use in JS. Provides text formatting for display and access to the underlying value.
+	* 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.
 	*/
-	export class BigIntegerWrapper {
-		protected constructor();
+	export class IdeConnection implements HasEventHandling {
+		/**
+		* @deprecated
+		*/
+		static readonly HACK_CONNECTION_FAILURE:string;
+		static readonly EVENT_DISCONNECT:string;
+		static readonly EVENT_RECONNECT:string;
+		static readonly EVENT_SHUTDOWN:string;
 
-		static ofString(str:string):BigIntegerWrapper;
-		asNumber():number;
-		valueOf():string;
-		toString():string;
-	}
+		/**
+		* creates a new instance, from which console sessions can be made. <b>options</b> are optional.
+		* @param serverUrl - The url used when connecting to the server. Read-only.
+		* @param connectOptions - Optional Object
+		* @param fromJava - Optional boolean
+		* @deprecated
+		*/
+		constructor(serverUrl:string, connectOptions?:ConnectOptions, fromJava?:boolean);
 
-	/**
-	* 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.
-	*/
-	export class TreeTableConfig {
 		/**
-		* The column representing the unique ID for each item
+		* closes the current connection, releasing any resources on the server or client.
 		*/
-		idColumn:string;
+		close():void;
+		running():Promise<IdeConnection>;
+		getObject(definitionObject:dh.ide.VariableDescriptor):Promise<any>;
+		subscribeToFieldUpdates(callback:(arg0:dh.ide.VariableChanges)=>void):()=>void;
 		/**
-		* The column representing the parent ID for each item
+		* Register a callback function to handle any log messages that are emitted on the server. Returns a function ,
+		* which can be invoked to remove this log handler. Any log handler registered in this way will receive as many old
+		* log messages as are presently available.
+		* @param callback - 
+		* @return {@link io.deephaven.web.shared.fu.JsRunnable}
 		*/
-		parentColumn:string;
+		onLogMessage(callback:(arg0:dh.ide.LogItem)=>void):()=>void;
+		startSession(type:string):Promise<IdeSession>;
+		getConsoleTypes():Promise<Array<string>>;
+		getWorkerHeapInfo():Promise<WorkerHeapInfo>;
 		/**
-		* Optional parameter indicating if items with an invalid parent ID should be promoted to root. Defaults to false.
+		* 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
 		*/
-		promoteOrphansToRoot:boolean;
-
-		constructor();
-	}
-
-	/**
-	* Presently optional and not used by the server, this allows the client to specify some authentication details. String
-	* authToken <i>- base 64 encoded auth token. String serviceId -</i> The service ID to use for the connection.
-	*/
-	export class ConnectOptions {
-		headers:{ [key: string]: string; };
-
-		constructor();
+		addEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<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:CustomEvent<T>)=>void):boolean;
 	}
 
 	/**
-	* 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.
+	* A js type for operating on input tables.
 	*
-	* 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.
+	* 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 TotalsTableConfig {
-		/**
-		* @deprecated
-		*/
-		static readonly COUNT:string;
+	export class InputTable {
+		protected constructor();
+
 		/**
-		* @deprecated
+		* 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
 		*/
-		static readonly MIN:string;
+		addRow(row:{ [key: string]: any; }, userTimeZone?:string):Promise<InputTable>;
 		/**
-		* @deprecated
+		* Add multiple rows to a table.
+		* @param rows - 
+		* @param userTimeZone - 
+		* @return Promise of dh.InputTable
 		*/
-		static readonly MAX:string;
+		addRows(rows:{ [key: string]: any; }[], userTimeZone?:string):Promise<InputTable>;
 		/**
-		* @deprecated
+		* 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
 		*/
-		static readonly SUM:string;
+		addTable(tableToAdd:Table):Promise<InputTable>;
 		/**
-		* @deprecated
+		* Add multiple tables to this Input Table.
+		* @param tablesToAdd - 
+		* @return Promise of dh.InputTable
 		*/
-		static readonly ABS_SUM:string;
+		addTables(tablesToAdd:Table[]):Promise<InputTable>;
 		/**
-		* @deprecated
+		* Deletes an entire table from this Input Table. Key columns must match the Input Table.
+		* @param tableToDelete - 
+		* @return Promise of dh.InputTable
 		*/
-		static readonly VAR:string;
+		deleteTable(tableToDelete:Table):Promise<InputTable>;
 		/**
-		* @deprecated
+		* Delete multiple tables from this Input Table.
+		* @param tablesToDelete - 
+		* @return 
 		*/
-		static readonly AVG:string;
+		deleteTables(tablesToDelete:Table[]):Promise<InputTable>;
 		/**
-		* @deprecated
+		* A list of the key columns, by name
+		* @return String array.
 		*/
-		static readonly STD:string;
+		get keys():string[];
 		/**
-		* @deprecated
+		* A list of the value columns, by name
+		* @return String array.
 		*/
-		static readonly FIRST:string;
+		get values():string[];
 		/**
-		* @deprecated
+		* A list of the key columns.
+		* @return Column array.
 		*/
-		static readonly LAST:string;
+		get keyColumns():Column[];
 		/**
-		* @deprecated
+		* A list of the value Column objects
+		* @return {@link dh.Column} array.
 		*/
-		static readonly SKIP:string;
+		get valueColumns():Column[];
 		/**
-		* Specifies if a Totals Table should be expanded by default in the UI. Defaults to false.
+		* The source table for this Input Table
+		* @return dh.table
 		*/
-		showTotalsByDefault:boolean;
+		get table():Table;
+	}
+
+	/**
+	* 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();
+
 		/**
-		* Specifies if a Grand Totals Table should be expanded by default in the UI. Defaults to false.
+		* the opposite of this condition
+		* @return FilterCondition
 		*/
-		showGrandTotalsByDefault:boolean;
+		not():FilterCondition;
 		/**
-		* Specifies the default operation for columns that do not have a specific operation applied; defaults to "Sum".
+		* a condition representing the current condition logically ANDed with the other parameters
+		* @param filters - 
+		* @return FilterCondition
 		*/
-		defaultOperation:AggregationOperationType;
+		and(...filters:FilterCondition[]):FilterCondition;
 		/**
-		* 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.
+		* a condition representing the current condition logically ORed with the other parameters
+		* @param filters - 
+		* @return FilterCondition.
 		*/
-		operationMap:{ [key: string]: Array<AggregationOperationType>; };
+		or(...filters:FilterCondition[]):FilterCondition;
 		/**
-		* 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`.
+		* a string suitable for debugging showing the details of this condition.
+		* @return String.
 		*/
-		groupBy:Array<string>;
+		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
+		*/
+		static invoke(func:string, ...args:FilterValue[]):FilterCondition;
+		/**
+		* 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 search(value:FilterValue, columns?:FilterValue[]):FilterCondition;
+	}
+
+	export class LoginCredentials {
+		type?:string|null;
+		username?:string|null;
+		token?:string|null;
 
 		constructor();
+	}
+
+	/**
+	* 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 Column {
+		/**
+		* 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):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):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):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
+		* <b>isUncoalesced</b> property on <b>Table</b>)
+		* @return boolean
+		*/
+		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 - 
+		* @return {@link dh.CustomColumn}
+		*/
+		static formatRowColor(expression:string):CustomColumn;
+		/**
+		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
+		* @param name - 
+		* @param expression - 
+		* @return {@link dh.CustomColumn}
+		*/
+		static createCustomColumn(name:string, expression:string):CustomColumn;
 	}
 
 	export class LongWrapper {
@@ -1063,31 +1106,13 @@ export namespace dh {
 	}
 
 	/**
-	* Describes a grouping and aggregations for a roll-up table. Pass to the <b>Table.rollup</b> function to create a
-	* roll-up table.
+	* Deprecated for use in Deephaven Core.
+	* @deprecated
 	*/
-	export class RollupConfig {
-		/**
-		* Ordered list of columns to group by to form the hierarchy of the resulting roll-up table.
-		*/
-		groupingColumns:Array<String>;
-		/**
-		* Mapping from each aggregation name to the ordered list of columns it should be applied to in the resulting
-		* roll-up table.
-		*/
-		aggregations:{ [key: string]: Array<AggregationOperationType>; };
-		/**
-		* 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.
-		*/
-		includeConstituents:boolean;
-		includeOriginalColumns?:boolean|null;
-		/**
-		* Optional parameter indicating if original column descriptions should be included. Defaults to true.
-		*/
-		includeDescriptions:boolean;
+	export class Client {
+		static readonly EVENT_REQUEST_FAILED:string;
+		static readonly EVENT_REQUEST_STARTED:string;
+		static readonly EVENT_REQUEST_SUCCEEDED:string;
 
 		constructor();
 	}
@@ -1185,427 +1210,236 @@ export namespace dh {
 
 
 	/**
-	* 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.
+	* Event fired when a command is issued from the client.
 	*/
-	export class Table implements JoinableTable, HasEventHandling {
-		readonly description?:string|null;
-		readonly pluginName?:string|null;
-		readonly layoutHints?:null|LayoutHints;
-		static readonly EVENT_SIZECHANGED:string;
-		static readonly EVENT_UPDATED:string;
-		static readonly EVENT_ROWADDED:string;
-		static readonly EVENT_ROWREMOVED:string;
-		static readonly EVENT_ROWUPDATED:string;
-		static readonly EVENT_SORTCHANGED:string;
-		static readonly EVENT_FILTERCHANGED:string;
-		static readonly EVENT_CUSTOMCOLUMNSCHANGED:string;
-		static readonly EVENT_DISCONNECT:string;
-		static readonly EVENT_RECONNECT:string;
-		static readonly EVENT_RECONNECTFAILED:string;
-		static readonly EVENT_REQUEST_FAILED:string;
-		static readonly EVENT_REQUEST_SUCCEEDED:string;
-		static readonly SIZE_UNCOALESCED:number;
+	export class CommandInfo {
+		constructor(code:string, result:Promise<dh.ide.CommandResult>);
 
-		protected constructor();
+		get result():Promise<dh.ide.CommandResult>;
+		get code():string;
+	}
 
-		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>;
-		/**
-		* Replace the currently set filters on the table. Returns the previously set value. Note that the filter property
-		* will immediately return the new value, but you may receive update events using the old filter before the new one
-		* is applied, and the <b>filterchanged</b> event fires. Reusing existing, applied filters 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 filter - 
-		* @return {@link dh.FilterCondition} array
-		*/
-		applyFilter(filter:FilterCondition[]):Array<FilterCondition>;
-		/**
-		* used when adding new filter and sort operations to the table, as long as they are present.
-		* @param customColumns - 
-		* @return {@link dh.CustomColumn} array
-		*/
-		applyCustomColumns(customColumns:Array<string|CustomColumn>):Array<CustomColumn>;
-		/**
-		* If the columns parameter is not provided, all columns will be used. If the updateIntervalMs parameter is not
-		* provided, a default of one second will be used. Until this is called, no data will be available. Invoking this
-		* will result in events to be fired once data becomes available, starting with an `updated` event and a
-		* <b>rowadded</b> event per row in that range. The returned object allows the viewport to be closed when no longer
-		* needed.
-		* @param firstRow - 
-		* @param lastRow - 
-		* @param columns - 
-		* @param updateIntervalMs - 
-		* @return {@link dh.TableViewportSubscription}
-		*/
-		setViewport(firstRow:number, lastRow:number, columns?:Array<Column>|undefined|null, updateIntervalMs?:number|undefined|null):TableViewportSubscription;
-		/**
-		* Gets the currently visible viewport. If the current set of operations has not yet resulted in data, it will not
-		* resolve until that data is ready. If this table is closed before the promise resolves, it will be rejected - to
-		* separate the lifespan of this promise from the table itself, call
-		* {@link TableViewportSubscription.getViewportData} on the result from {@link Table.setViewport}.
-		* @return Promise of {@link dh.TableData}
-		*/
-		getViewportData():Promise<TableData>;
-		/**
-		* Creates a subscription to the specified columns, across all rows in the table. The optional parameter
-		* updateIntervalMs may be specified to indicate how often the server should send updates, defaulting to one second
-		* if omitted. Useful for charts or taking a snapshot of the table atomically. The initial snapshot will arrive in a
-		* single event, but later changes will be sent as updates. However, this may still be very expensive to run from a
-		* browser for very large tables. Each call to subscribe creates a new subscription, which must have <b>close()</b>
-		* called on it to stop it, and all events are fired from the TableSubscription instance.
-		* @param columns - 
-		* @param updateIntervalMs - 
-		* @return {@link dh.TableSubscription}
-		*/
-		subscribe(columns:Array<Column>, updateIntervalMs?:number):TableSubscription;
-		/**
-		* a new table containing the distinct tuples of values from the given columns that are present in the original
-		* table. This table can be manipulated as any other table. Sorting is often desired as the default sort is the
-		* order of appearance of values from the original table.
-		* @param columns - 
-		* @return Promise of dh.Table
-		*/
-		selectDistinct(columns:Column[]):Promise<Table>;
-		/**
-		* Creates a new copy of this table, so it can be sorted and filtered separately, and maintain a different viewport.
-		* @return Promise of dh.Table
-		*/
-		copy():Promise<Table>;
-		/**
-		* a promise that will resolve to a Totals Table of this table. This table will obey the configurations provided as
-		* a parameter, or will use the table's default if no parameter is provided, and be updated once per second as
-		* necessary. Note that multiple calls to this method will each produce a new TotalsTable which must have close()
-		* called on it when not in use.
-		* @param config - 
-		* @return Promise of dh.TotalsTable
-		*/
-		getTotalsTable(config?:TotalsTableConfig|undefined|null):Promise<TotalsTable>;
+	/**
+	* 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 not directly supported. 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 TreeRow.hasChildren} is false will be different from usual.</li>
+	* </ul>
+	*/
+	export class TreeTable implements HasEventHandling {
 		/**
-		* a promise that will resolve to a Totals Table of this table, ignoring any filters. See <b>getTotalsTable()</b>
-		* above for more specifics.
-		* @param config - 
-		* @return promise of dh.TotalsTable
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
 		*/
-		getGrandTotalsTable(config?:TotalsTableConfig|undefined|null):Promise<TotalsTable>;
+		static readonly EVENT_UPDATED:string;
 		/**
-		* a promise that will resolve to a new roll-up <b>TreeTable</b> of this table. Multiple calls to this method will
-		* each produce a new <b>TreeTable</b> which must have close() called on it when not in use.
-		* @param configObject - 
-		* @return Promise of dh.TreeTable
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
 		*/
-		rollup(configObject:RollupConfig):Promise<TreeTable>;
+		static readonly EVENT_DISCONNECT:string;
 		/**
-		* a promise that will resolve to a new `TreeTable` of this table. Multiple calls to this method will each produce a
-		* new `TreeTable` which must have close() called on it when not in use.
-		* @param configObject - 
-		* @return Promise dh.TreeTable
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
 		*/
-		treeTable(configObject:TreeTableConfig):Promise<TreeTable>;
+		static readonly EVENT_RECONNECT:string;
 		/**
-		* a "frozen" version of this table (a server-side snapshot of the entire source table). Viewports on the frozen
-		* table will not update. This does not change the original table, and the new table will not have any of the client
-		* side sorts/filters/columns. New client side sorts/filters/columns can be added to the frozen copy.
-		* @return Promise of dh.Table
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
 		*/
-		freeze():Promise<Table>;
-		snapshot(baseTable:Table, doInitialSnapshot?:boolean, stampColumns?:string[]):Promise<Table>;
+		static readonly EVENT_RECONNECTFAILED:string;
 		/**
-		* 
-		* @inheritDoc
-		* @deprecated
+		* event.detail is the currently visible viewport data based on the active viewport configuration.
 		*/
-		join(joinType:string, rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
-		asOfJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
-		crossJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, reserveBits?:number|undefined|null):Promise<Table>;
-		exactJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>):Promise<Table>;
-		naturalJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>):Promise<Table>;
-		byExternal(keys:object, dropKeys?:boolean):Promise<PartitionedTable>;
+		static readonly EVENT_REQUEST_FAILED:string;
+		readonly description?:string|null;
+		readonly layoutHints?:null|LayoutHints;
+
+		protected constructor();
+
 		/**
-		* Creates a new PartitionedTable from the contents of the current table, partitioning data based on the specified
-		* keys.
-		* @param keys - 
-		* @param dropKeys - 
-		* @return Promise dh.PartitionedTable
+		* 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 - 
 		*/
-		partitionBy(keys:object, dropKeys?:boolean):Promise<PartitionedTable>;
+		expand(row:TreeRow|number, expandDescendants?:boolean):void;
 		/**
-		* a promise that will resolve to ColumnStatistics for the column of this table.
-		* @param column - 
-		* @return Promise of dh.ColumnStatistics
+		* 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 - 
 		*/
-		getColumnStatistics(column:Column):Promise<ColumnStatistics>;
+		collapse(row:TreeRow|number):void;
 		/**
-		* Seek the row matching the data provided
-		* @param startingRow - Row to start the seek from
-		* @param column - Column to seek for value on
-		* @param valueType - Type of value provided
-		* @param seekValue - Value to seek
-		* @param insensitive - Optional value to flag a search as case-insensitive. Defaults to `false`.
-		* @param contains - Optional value to have the seek value do a contains search instead of exact equality. Defaults to
-		*        `false`.
-		* @param isBackwards - Optional value to seek backwards through the table instead of forwards. Defaults to `false`.
-		* @return A promise that resolves to the row value found.
+		* 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 - 
+		* @param isExpanded - 
+		* @param expandDescendants - 
 		*/
-		seekRow(startingRow:number, column:Column, valueType:ValueTypeType, seekValue:any, insensitive?:boolean|undefined|null, contains?:boolean|undefined|null, isBackwards?:boolean|undefined|null):Promise<number>;
-		toString():string;
+		setExpanded(row:TreeRow|number, isExpanded:boolean, expandDescendants?:boolean):void;
+		expandAll():void;
+		collapseAll():void;
 		/**
-		* True if this table represents a user Input Table (created by InputTable.newInputTable). When true, you may call
-		* .inputTable() to add or remove data from the underlying table.
+		* true if the given row is expanded, false otherwise. Equivalent to `TreeRow.isExpanded`, if an instance of the row
+		* is available
+		* @param row - 
 		* @return boolean
 		*/
-		get hasInputTable():boolean;
-		/**
-		* The columns that are present on this table. This is always all possible columns. If you specify fewer columns in
-		* .setViewport(), you will get only those columns in your ViewportData. <b>Number size</b> The total count of rows
-		* in the table. The size can and will change; see the <b>sizechanged</b> event for details. Size will be negative
-		* in exceptional cases (eg. the table is uncoalesced, see the <b>isUncoalesced</b> property for details).
-		* @return {@link dh.Column} array
-		*/
-		get columns():Array<Column>;
+		isExpanded(row:TreeRow|number):boolean;
+		setViewport(firstRow:number, lastRow:number, columns?:Array<Column>|undefined|null, updateInterval?:number|undefined|null):void;
+		getViewportData():Promise<TreeViewportData>;
 		/**
-		* The default configuration to be used when building a <b>TotalsTable</b> for this table.
-		* @return dh.TotalsTableConfig
+		* Indicates that the table will no longer be used, and server resources can be freed.
 		*/
-		get totalsTableConfig():TotalsTableConfig;
+		close():void;
+		typedTicket():dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
 		/**
-		* An ordered list of Sorts to apply to the table. To update, call <b>applySort()</b>. Note that this getter will
-		* return the new value immediately, even though it may take a little time to update on the server. You may listen
-		* for the <b>sortchanged</b> event to know when to update the UI.
+		* Applies the given sort to all levels of the tree. Returns the previous sort in use.
+		* @param sort - 
 		* @return {@link dh.Sort} array
 		*/
-		get sort():Array<Sort>;
-		/**
-		* An ordered list of custom column formulas to add to the table, either adding new columns or replacing existing
-		* ones. To update, call <b>applyCustomColumns()</b>.
-		* @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;
+		applySort(sort:Sort[]):Array<Sort>;
 		/**
-		* An ordered list of Filters to apply to the table. To update, call applyFilter(). Note that this getter will
-		* return the new value immediately, even though it may take a little time to update on the server. You may listen
-		* for the <b>filterchanged</b> event to know when to update the UI.
+		* Applies the given filter to the contents of the tree in such a way that if any node is visible, then any parent
+		* node will be visible as well even if that parent node would not normally be visible due to the filter's
+		* condition. Returns the previous sort in use.
+		* @param filter - 
 		* @return {@link dh.FilterCondition} array
 		*/
-		get filter():Array<FilterCondition>;
-		/**
-		* The total count of the rows in the table, excluding any filters. Unlike <b>size</b>, changes to this value will
-		* not result in any event. <b>Sort[] sort</b> an ordered list of Sorts to apply to the table. To update, call
-		* applySort(). Note that this getter will return the new value immediately, even though it may take a little time
-		* to update on the server. You may listen for the <b>sortchanged</b> event to know when to update the UI.
-		* @return double
-		*/
-		get totalSize():number;
-		/**
-		* The total count of rows in the table. The size can and will change; see the <b>sizechanged</b> event for details.
-		* Size will be negative in exceptional cases (e.g., the table is uncoalesced; see the <b>isUncoalesced</b>
-		* property). for details).
-		* @return double
-		*/
-		get size():number;
-		/**
-		* True if this table has been closed.
-		* @return boolean
-		*/
-		get isClosed():boolean;
-		/**
-		* Read-only. True if this table is uncoalesced. Set a viewport or filter on the partition columns to coalesce the
-		* table. Check the <b>isPartitionColumn</b> property on the table columns to retrieve the partition columns. Size
-		* will be unavailable until table is coalesced.
-		* @return boolean
-		*/
-		get isUncoalesced():boolean;
-		/**
-		* 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:CustomEvent<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
-		hasListeners(name:string):boolean;
+		applyFilter(filter:FilterCondition[]):Array<FilterCondition>;
 		/**
-		* Removes an event listener added to this table.
-		* @param name - 
-		* @param callback - 
-		* @return 
-		* @typeParam T - 
+		* a column with the given name, or throws an exception if it cannot be found
+		* @param key - 
+		* @return {@link dh.Column}
 		*/
-		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
+		findColumn(key:string):Column;
 		/**
-		* a Sort than can be used to reverse a table. This can be passed into n array in applySort. Note that Tree Tables
-		* do not support reverse.
-		* @return {@link dh.Sort}
+		* an array with all of the named columns in order, or throws an exception if one cannot be found.
+		* @param keys - 
+		* @return {@link dh.Column} array
 		*/
-		static reverse():Sort;
-	}
-
-	/**
-	* 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();
-
+		findColumns(keys:string[]):Column[];
 		/**
-		* Builds a Sort instance to sort values in ascending order.
-		* @return {@link dh.Sort}
+		* Provides Table-like selectDistinct functionality, but with a few quirks, since it is only fetching the distinct
+		* values for the given columns in the source table:
+		* <ul>
+		* <li>Rollups may make no sense, since values are aggregated.</li>
+		* <li>Values found on orphaned (and removed) nodes will show up in the resulting table, even though they are not in
+		* the tree.</li>
+		* <li>Values found on parent nodes which are only present in the tree since a child is visible will not be present
+		* in the resulting table.</li>
+		* </ul>
 		*/
-		asc():Sort;
+		selectDistinct(columns:Column[]):Promise<Table>;
+		getTotalsTableConfig():Promise<TotalsTableConfig>;
+		getTotalsTable(config?:object):Promise<TotalsTable>;
+		getGrandTotalsTable(config?:object):Promise<TotalsTable>;
 		/**
-		* Builds a Sort instance to sort values in descending order.
-		* @return {@link dh.Sort}
+		* 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
 		*/
-		desc():Sort;
+		copy():Promise<TreeTable>;
 		/**
-		* Builds a Sort instance which takes the absolute value before applying order.
-		* @return {@link dh.Sort}
+		* The current filter configuration of this Tree Table.
+		* @return {@link dh.FilterCondition} array
 		*/
-		abs():Sort;
-		toString():string;
+		get filter():Array<FilterCondition>;
 		/**
-		* True if the absolute value of the column should be used when sorting; defaults to false.
+		* True if this is a roll-up and will provide the original rows that make up each grouping.
 		* @return boolean
 		*/
-		get isAbs():boolean;
-		/**
-		* The column which is sorted.
-		* @return {@link dh.Column}
-		*/
-		get column():Column;
+		get includeConstituents():boolean;
+		get groupedColumns():Array<Column>;
 		/**
-		* The direction of this sort, either <b>ASC</b>, <b>DESC</b>, or <b>REVERSE</b>.
-		* @return String
+		* True if this table has been closed.
+		* @return boolean
 		*/
-		get direction():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();
-
+		get isClosed():boolean;
 		/**
-		* the opposite of this condition
-		* @return FilterCondition
+		* 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
 		*/
-		not():FilterCondition;
+		get size():number;
 		/**
-		* a condition representing the current condition logically ANDed with the other parameters
-		* @param filters - 
-		* @return FilterCondition
+		* The columns that can be shown in this Tree Table.
+		* @return {@link dh.Column} array
 		*/
-		and(...filters:FilterCondition[]):FilterCondition;
+		get columns():Array<Column>;
 		/**
-		* a condition representing the current condition logically ORed with the other parameters
-		* @param filters - 
-		* @return FilterCondition.
+		* The current sort configuration of this Tree Table
+		* @return {@link dh.Sort} array.
 		*/
-		or(...filters:FilterCondition[]):FilterCondition;
+		get sort():Array<Sort>;
 		/**
-		* a string suitable for debugging showing the details of this condition.
-		* @return String.
+		* True if this table may receive updates from the server, including size changed events, updated events after
+		* initial snapshot.
+		* @return boolean
 		*/
-		toString():string;
-		get columns():Array<Column>;
+		get isRefreshing():boolean;
 		/**
-		* 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
+		* 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
 		*/
-		static invoke(func:string, ...args:FilterValue[]):FilterCondition;
+		addEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
+		hasListeners(name:string):boolean;
 		/**
-		* 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
+		* Removes an event listener added to this table.
+		* @param name - 
+		* @param callback - 
+		* @return 
+		* @typeParam T - 
 		*/
-		static search(value:FilterValue, columns?:FilterValue[]):FilterCondition;
+		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
+	}
+
+	export class QueryInfo {
+		static readonly EVENT_TABLE_OPENED:string;
+		static readonly EVENT_DISCONNECT:string;
+		static readonly EVENT_RECONNECT:string;
+		static readonly EVENT_CONNECT:string;
+
+		protected constructor();
 	}
 
 	/**
@@ -1705,380 +1539,542 @@ export namespace dh {
 		*/
 		notInIgnoreCase(terms:FilterValue[]):FilterCondition;
 		/**
-		* a filter condition checking if the given value contains the given string value
-		* @param term - 
-		* @return {@link dh.FilterCondition}
+		* a filter condition checking if the given value contains the given string value
+		* @param term - 
+		* @return {@link dh.FilterCondition}
+		*/
+		contains(term:FilterValue):FilterCondition;
+		/**
+		* a filter condition checking if the given value contains the given string value, ignoring differences of upper vs
+		* lower case
+		* @param term - 
+		* @return {@link dh.FilterCondition}
+		*/
+		containsIgnoreCase(term:FilterValue):FilterCondition;
+		/**
+		* a filter condition checking if the given value matches the provided regular expressions string. Regex patterns
+		* use Java regex syntax
+		* @param pattern - 
+		* @return {@link dh.FilterCondition}
+		*/
+		matches(pattern:FilterValue):FilterCondition;
+		/**
+		* a filter condition checking if the given value matches the provided regular expressions string, ignoring
+		* differences of upper vs lower case. Regex patterns use Java regex syntax
+		* @param pattern - 
+		* @return {@link dh.FilterCondition}
+		*/
+		matchesIgnoreCase(pattern:FilterValue):FilterCondition;
+		/**
+		* a filter condition checking if the current value is a true boolean
+		* @return {@link dh.FilterCondition}
+		*/
+		isTrue():FilterCondition;
+		/**
+		* a filter condition checking if the current value is a false boolean
+		* @return {@link dh.FilterCondition}
+		*/
+		isFalse():FilterCondition;
+		/**
+		* a filter condition checking if the current value is a null value
+		* @return {@link dh.FilterCondition}
+		*/
+		isNull():FilterCondition;
+		/**
+		* a filter condition invoking the given method on the current value, with the given parameters. Currently supported
+		* functions that can be invoked on a String:
+		* <ul>
+		* <li><b>startsWith</b>: Returns true if the current string value starts with the supplied string argument</li>
+		* <li><b>endsWith</b>: Returns true if the current string value ends with the supplied string argument</li>
+		* <li><b>matches</b>: Returns true if the current string value matches the supplied string argument used as a Java
+		* 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 
+		*/
+		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;
+	}
+
+	/**
+	* 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;
+		/**
+		* a new iterator over all indexes in this collection.
+		* @return Iterator of {@link dh.LongWrapper}
+		*/
+		iterator():Iterator<LongWrapper>;
+		/**
+		* 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
+		*/
+		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;
+	}
+
+	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_REFRESH_TOKEN_UPDATED:string;
+		static readonly EVENT_REQUEST_FAILED:string;
+		static readonly EVENT_REQUEST_STARTED:string;
+		static readonly EVENT_REQUEST_SUCCEEDED: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:CustomEvent<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
+		hasListeners(name:string):boolean;
+		removeEventListener<T>(name:string, callback:(e:CustomEvent<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;
+		/**
+		* The expression to evaluate this custom column.
+		* @return String
 		*/
-		contains(term:FilterValue):FilterCondition;
+		get expression():string;
 		/**
-		* a filter condition checking if the given value contains the given string value, ignoring differences of upper vs
-		* lower case
-		* @param term - 
-		* @return {@link dh.FilterCondition}
+		* The name of the column to use.
+		* @return String
 		*/
-		containsIgnoreCase(term:FilterValue):FilterCondition;
+		get name():string;
 		/**
-		* a filter condition checking if the given value matches the provided regular expressions string. Regex patterns
-		* use Java regex syntax
-		* @param pattern - 
-		* @return {@link dh.FilterCondition}
+		* 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
 		*/
-		matches(pattern:FilterValue):FilterCondition;
+		get type():string;
+	}
+
+	/**
+	* 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;
+	}
+
+	/**
+	* 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.
+	*
+	* 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.
+	*
+	* 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 TableSubscription implements HasEventHandling {
 		/**
-		* a filter condition checking if the given value matches the provided regular expressions string, ignoring
-		* differences of upper vs lower case. Regex patterns use Java regex syntax
-		* @param pattern - 
-		* @return {@link dh.FilterCondition}
+		* Indicates that some new data is available on the client, either an initial snapshot or a delta update. The
+		* <b>detail</b> field of the event will contain a TableSubscriptionEventData detailing what has changed, or
+		* allowing access to the entire range of items currently in the subscribed columns.
 		*/
-		matchesIgnoreCase(pattern:FilterValue):FilterCondition;
+		static readonly EVENT_UPDATED:string;
+
+		protected constructor();
+
 		/**
-		* a filter condition checking if the current value is a true boolean
-		* @return {@link dh.FilterCondition}
+		* Stops the subscription on the server.
 		*/
-		isTrue():FilterCondition;
+		close():void;
+		addEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
+		hasListeners(name:string):boolean;
+		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
 		/**
-		* a filter condition checking if the current value is a false boolean
-		* @return {@link dh.FilterCondition}
+		* The columns that were subscribed to when this subscription was created
+		* @return {@link dh.Column}
 		*/
-		isFalse():FilterCondition;
+		get columns():Array<Column>;
+	}
+
+	/**
+	* 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 {
 		/**
-		* a filter condition checking if the current value is a null value
-		* @return {@link dh.FilterCondition}
+		* Ordered list of columns to group by to form the hierarchy of the resulting roll-up table.
 		*/
-		isNull():FilterCondition;
+		groupingColumns:Array<String>;
 		/**
-		* a filter condition invoking the given method on the current value, with the given parameters. Currently supported
-		* functions that can be invoked on a String:
-		* <ul>
-		* <li><b>startsWith</b>: Returns true if the current string value starts with the supplied string argument</li>
-		* <li><b>endsWith</b>: Returns true if the current string value ends with the supplied string argument</li>
-		* <li><b>matches</b>: Returns true if the current string value matches the supplied string argument used as a Java
-		* 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 
+		* Mapping from each aggregation name to the ordered list of columns it should be applied to in the resulting
+		* roll-up table.
 		*/
-		invoke(method:string, ...args:FilterValue[]):FilterCondition;
-		toString():string;
+		aggregations:{ [key: string]: Array<AggregationOperationType>; };
 		/**
-		* Constructs a string for the filter API from the given parameter.
-		* @param input - 
-		* @return 
+		* 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.
 		*/
-		static ofString(input:any):FilterValue;
+		includeConstituents:boolean;
+		includeOriginalColumns?:boolean|null;
 		/**
-		* Constructs a boolean for the filter API from the given parameter.
-		* @param b - 
-		* @return 
+		* Optional parameter indicating if original column descriptions should be included. Defaults to true.
 		*/
-		static ofBoolean(b:boolean):FilterValue;
+		includeDescriptions:boolean;
+
+		constructor();
 	}
 
 	/**
-	* 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
+	* 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 TableMap {
-		static readonly EVENT_KEYADDED:string;
+	export class Table implements JoinableTable, HasEventHandling {
+		readonly description?:string|null;
+		readonly pluginName?:string|null;
+		readonly layoutHints?:null|LayoutHints;
+		static readonly EVENT_SIZECHANGED:string;
+		static readonly EVENT_UPDATED:string;
+		static readonly EVENT_ROWADDED:string;
+		static readonly EVENT_ROWREMOVED:string;
+		static readonly EVENT_ROWUPDATED:string;
+		static readonly EVENT_SORTCHANGED:string;
+		static readonly EVENT_FILTERCHANGED:string;
+		static readonly EVENT_CUSTOMCOLUMNSCHANGED:string;
 		static readonly EVENT_DISCONNECT:string;
 		static readonly EVENT_RECONNECT:string;
 		static readonly EVENT_RECONNECTFAILED:string;
-
-		protected constructor();
-	}
-
-	/**
-	* 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 Column {
-		/**
-		* 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;
+		static readonly EVENT_REQUEST_FAILED:string;
+		static readonly EVENT_REQUEST_SUCCEEDED:string;
+		static readonly SIZE_UNCOALESCED:number;
 
 		protected constructor();
 
+		batch(userCode:(arg0:unknown)=>void):Promise<Table>;
 		/**
-		* 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}
+		* 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}
 		*/
-		filter():FilterValue;
+		findColumn(key:string):Column;
 		/**
-		* a <b>CustomColumn</b> object to apply using `applyCustomColumns` with the expression specified.
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* Retrieve multiple columns specified by the given names.
+		* @param keys - 
+		* @return {@link dh.Column} array
 		*/
-		formatColor(expression:string):CustomColumn;
+		findColumns(keys:string[]):Column[];
+		isBlinkTable():boolean;
 		/**
-		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* 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
 		*/
-		formatNumber(expression:string):CustomColumn;
+		inputTable():Promise<InputTable>;
 		/**
-		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* Indicates that this Table instance will no longer be used, and its connection to the server can be cleaned up.
 		*/
-		formatDate(expression:string):CustomColumn;
-		toString():string;
+		close():void;
+		getAttributes():string[];
 		/**
-		* Label for this column.
-		* @return 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
 		*/
-		get name():string;
+		getAttribute(attributeName:string):unknown|undefined|null;
 		/**
-		* True if this column is a partition column. Partition columns are used for filtering uncoalesced tables (see
-		* <b>isUncoalesced</b> property on <b>Table</b>)
-		* @return boolean
+		* 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
 		*/
-		get isPartitionColumn():boolean;
+		applySort(sort:Sort[]):Array<Sort>;
 		/**
-		* 
-		* @deprecated do not use. Internal index of the column in the table, to be used as a key on the Row.
-		* @return int
+		* Replace the currently set filters on the table. Returns the previously set value. Note that the filter property
+		* will immediately return the new value, but you may receive update events using the old filter before the new one
+		* is applied, and the <b>filterchanged</b> event fires. Reusing existing, applied filters 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 filter - 
+		* @return {@link dh.FilterCondition} array
 		*/
-		get index():number;
-		get isSortable():boolean;
+		applyFilter(filter:FilterCondition[]):Array<FilterCondition>;
 		/**
-		* Type of the row data that can be found in this column.
-		* @return String
+		* used when adding new filter and sort operations to the table, as long as they are present.
+		* @param customColumns - 
+		* @return {@link dh.CustomColumn} array
 		*/
-		get type():string;
+		applyCustomColumns(customColumns:Array<string|CustomColumn>):Array<CustomColumn>;
 		/**
-		* 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 - 
-		* @return {@link dh.CustomColumn}
+		* If the columns parameter is not provided, all columns will be used. If the updateIntervalMs parameter is not
+		* provided, a default of one second will be used. Until this is called, no data will be available. Invoking this
+		* will result in events to be fired once data becomes available, starting with an `updated` event and a
+		* <b>rowadded</b> event per row in that range. The returned object allows the viewport to be closed when no longer
+		* needed.
+		* @param firstRow - 
+		* @param lastRow - 
+		* @param columns - 
+		* @param updateIntervalMs - 
+		* @return {@link dh.TableViewportSubscription}
 		*/
-		static formatRowColor(expression:string):CustomColumn;
+		setViewport(firstRow:number, lastRow:number, columns?:Array<Column>|undefined|null, updateIntervalMs?:number|undefined|null):TableViewportSubscription;
 		/**
-		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
-		* @param name - 
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* Gets the currently visible viewport. If the current set of operations has not yet resulted in data, it will not
+		* resolve until that data is ready. If this table is closed before the promise resolves, it will be rejected - to
+		* separate the lifespan of this promise from the table itself, call
+		* {@link TableViewportSubscription.getViewportData} on the result from {@link Table.setViewport}.
+		* @return Promise of {@link dh.TableData}
 		*/
-		static createCustomColumn(name:string, expression:string):CustomColumn;
-	}
-
-	/**
-	* 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 not directly supported. 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 TreeRow.hasChildren} is false will be different from usual.</li>
-	* </ul>
-	*/
-	export class TreeTable implements HasEventHandling {
+		getViewportData():Promise<TableData>;
 		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
+		* Creates a subscription to the specified columns, across all rows in the table. The optional parameter
+		* updateIntervalMs may be specified to indicate how often the server should send updates, defaulting to one second
+		* if omitted. Useful for charts or taking a snapshot of the table atomically. The initial snapshot will arrive in a
+		* single event, but later changes will be sent as updates. However, this may still be very expensive to run from a
+		* browser for very large tables. Each call to subscribe creates a new subscription, which must have <b>close()</b>
+		* called on it to stop it, and all events are fired from the TableSubscription instance.
+		* @param columns - 
+		* @param updateIntervalMs - 
+		* @return {@link dh.TableSubscription}
 		*/
-		static readonly EVENT_UPDATED:string;
+		subscribe(columns:Array<Column>, updateIntervalMs?:number):TableSubscription;
 		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
+		* a new table containing the distinct tuples of values from the given columns that are present in the original
+		* table. This table can be manipulated as any other table. Sorting is often desired as the default sort is the
+		* order of appearance of values from the original table.
+		* @param columns - 
+		* @return Promise of dh.Table
 		*/
-		static readonly EVENT_DISCONNECT:string;
+		selectDistinct(columns:Column[]):Promise<Table>;
 		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
+		* Creates a new copy of this table, so it can be sorted and filtered separately, and maintain a different viewport.
+		* @return Promise of dh.Table
 		*/
-		static readonly EVENT_RECONNECT:string;
+		copy():Promise<Table>;
 		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
+		* a promise that will resolve to a Totals Table of this table. This table will obey the configurations provided as
+		* a parameter, or will use the table's default if no parameter is provided, and be updated once per second as
+		* necessary. Note that multiple calls to this method will each produce a new TotalsTable which must have close()
+		* called on it when not in use.
+		* @param config - 
+		* @return Promise of dh.TotalsTable
 		*/
-		static readonly EVENT_RECONNECTFAILED:string;
+		getTotalsTable(config?:TotalsTableConfig|undefined|null):Promise<TotalsTable>;
 		/**
-		* event.detail is the currently visible viewport data based on the active viewport configuration.
+		* a promise that will resolve to a Totals Table of this table, ignoring any filters. See <b>getTotalsTable()</b>
+		* above for more specifics.
+		* @param config - 
+		* @return promise of dh.TotalsTable
 		*/
-		static readonly EVENT_REQUEST_FAILED:string;
-		readonly description?:string|null;
-		readonly layoutHints?:null|LayoutHints;
-
-		protected constructor();
-
+		getGrandTotalsTable(config?:TotalsTableConfig|undefined|null):Promise<TotalsTable>;
 		/**
-		* 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 - 
+		* a promise that will resolve to a new roll-up <b>TreeTable</b> of this table. Multiple calls to this method will
+		* each produce a new <b>TreeTable</b> which must have close() called on it when not in use.
+		* @param configObject - 
+		* @return Promise of dh.TreeTable
 		*/
-		expand(row:TreeRow|number, expandDescendants?:boolean):void;
+		rollup(configObject:RollupConfig):Promise<TreeTable>;
 		/**
-		* 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 - 
+		* a promise that will resolve to a new `TreeTable` of this table. Multiple calls to this method will each produce a
+		* new `TreeTable` which must have close() called on it when not in use.
+		* @param configObject - 
+		* @return Promise dh.TreeTable
 		*/
-		collapse(row:TreeRow|number):void;
+		treeTable(configObject:TreeTableConfig):Promise<TreeTable>;
 		/**
-		* 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 - 
-		* @param isExpanded - 
-		* @param expandDescendants - 
+		* a "frozen" version of this table (a server-side snapshot of the entire source table). Viewports on the frozen
+		* table will not update. This does not change the original table, and the new table will not have any of the client
+		* side sorts/filters/columns. New client side sorts/filters/columns can be added to the frozen copy.
+		* @return Promise of dh.Table
 		*/
-		setExpanded(row:TreeRow|number, isExpanded:boolean, expandDescendants?:boolean):void;
-		expandAll():void;
-		collapseAll():void;
+		freeze():Promise<Table>;
+		snapshot(baseTable:Table, doInitialSnapshot?:boolean, stampColumns?:string[]):Promise<Table>;
 		/**
-		* true if the given row is expanded, false otherwise. Equivalent to `TreeRow.isExpanded`, if an instance of the row
-		* is available
-		* @param row - 
-		* @return boolean
+		* 
+		* @inheritDoc
+		* @deprecated
 		*/
-		isExpanded(row:TreeRow|number):boolean;
-		setViewport(firstRow:number, lastRow:number, columns?:Array<Column>|undefined|null, updateInterval?:number|undefined|null):void;
-		getViewportData():Promise<TreeViewportData>;
+		join(joinType:string, rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
+		asOfJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, asOfMatchRule?:string|undefined|null):Promise<Table>;
+		crossJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null, reserveBits?:number|undefined|null):Promise<Table>;
+		exactJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>):Promise<Table>;
+		naturalJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>):Promise<Table>;
+		byExternal(keys:object, dropKeys?:boolean):Promise<PartitionedTable>;
 		/**
-		* Indicates that the table will no longer be used, and server resources can be freed.
+		* Creates a new PartitionedTable from the contents of the current table, partitioning data based on the specified
+		* keys.
+		* @param keys - 
+		* @param dropKeys - 
+		* @return Promise dh.PartitionedTable
 		*/
-		close():void;
-		typedTicket():dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
+		partitionBy(keys:object, dropKeys?:boolean):Promise<PartitionedTable>;
 		/**
-		* Applies the given sort to all levels of the tree. Returns the previous sort in use.
-		* @param sort - 
-		* @return {@link dh.Sort} array
+		* a promise that will resolve to ColumnStatistics for the column of this table.
+		* @param column - 
+		* @return Promise of dh.ColumnStatistics
 		*/
-		applySort(sort:Sort[]):Array<Sort>;
+		getColumnStatistics(column:Column):Promise<ColumnStatistics>;
 		/**
-		* Applies the given filter to the contents of the tree in such a way that if any node is visible, then any parent
-		* node will be visible as well even if that parent node would not normally be visible due to the filter's
-		* condition. Returns the previous sort in use.
-		* @param filter - 
-		* @return {@link dh.FilterCondition} array
+		* Seek the row matching the data provided
+		* @param startingRow - Row to start the seek from
+		* @param column - Column to seek for value on
+		* @param valueType - Type of value provided
+		* @param seekValue - Value to seek
+		* @param insensitive - Optional value to flag a search as case-insensitive. Defaults to `false`.
+		* @param contains - Optional value to have the seek value do a contains search instead of exact equality. Defaults to
+		*        `false`.
+		* @param isBackwards - Optional value to seek backwards through the table instead of forwards. Defaults to `false`.
+		* @return A promise that resolves to the row value found.
 		*/
-		applyFilter(filter:FilterCondition[]):Array<FilterCondition>;
+		seekRow(startingRow:number, column:Column, valueType:ValueTypeType, seekValue:any, insensitive?:boolean|undefined|null, contains?:boolean|undefined|null, isBackwards?:boolean|undefined|null):Promise<number>;
+		toString():string;
 		/**
-		* a column with the given name, or throws an exception if it cannot be found
-		* @param key - 
-		* @return {@link dh.Column}
+		* True if this table represents a user Input Table (created by InputTable.newInputTable). When true, you may call
+		* .inputTable() to add or remove data from the underlying table.
+		* @return boolean
 		*/
-		findColumn(key:string):Column;
+		get hasInputTable():boolean;
 		/**
-		* an array with all of the named columns in order, or throws an exception if one cannot be found.
-		* @param keys - 
+		* The columns that are present on this table. This is always all possible columns. If you specify fewer columns in
+		* .setViewport(), you will get only those columns in your ViewportData. <b>Number size</b> The total count of rows
+		* in the table. The size can and will change; see the <b>sizechanged</b> event for details. Size will be negative
+		* in exceptional cases (eg. the table is uncoalesced, see the <b>isUncoalesced</b> property for details).
 		* @return {@link dh.Column} array
 		*/
-		findColumns(keys:string[]):Column[];
+		get columns():Array<Column>;
 		/**
-		* Provides Table-like selectDistinct functionality, but with a few quirks, since it is only fetching the distinct
-		* values for the given columns in the source table:
-		* <ul>
-		* <li>Rollups may make no sense, since values are aggregated.</li>
-		* <li>Values found on orphaned (and removed) nodes will show up in the resulting table, even though they are not in
-		* the tree.</li>
-		* <li>Values found on parent nodes which are only present in the tree since a child is visible will not be present
-		* in the resulting table.</li>
-		* </ul>
+		* The default configuration to be used when building a <b>TotalsTable</b> for this table.
+		* @return dh.TotalsTableConfig
 		*/
-		selectDistinct(columns:Column[]):Promise<Table>;
-		getTotalsTableConfig():Promise<TotalsTableConfig>;
-		getTotalsTable(config?:object):Promise<TotalsTable>;
-		getGrandTotalsTable(config?:object):Promise<TotalsTable>;
+		get totalsTableConfig():TotalsTableConfig;
 		/**
-		* 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
+		* An ordered list of Sorts to apply to the table. To update, call <b>applySort()</b>. Note that this getter will
+		* return the new value immediately, even though it may take a little time to update on the server. You may listen
+		* for the <b>sortchanged</b> event to know when to update the UI.
+		* @return {@link dh.Sort} array
 		*/
-		copy():Promise<TreeTable>;
+		get sort():Array<Sort>;
 		/**
-		* The current filter configuration of this Tree Table.
-		* @return {@link dh.FilterCondition} array
+		* An ordered list of custom column formulas to add to the table, either adding new columns or replacing existing
+		* ones. To update, call <b>applyCustomColumns()</b>.
+		* @return {@link dh.CustomColumn} array
 		*/
-		get filter():Array<FilterCondition>;
+		get customColumns():Array<CustomColumn>;
 		/**
-		* True if this is a roll-up and will provide the original rows that make up each grouping.
+		* True if this table may receive updates from the server, including size changed events, updated events after
+		* initial snapshot.
 		* @return boolean
 		*/
-		get includeConstituents():boolean;
-		get groupedColumns():Array<Column>;
+		get isRefreshing():boolean;
 		/**
-		* True if this table has been closed.
-		* @return boolean
+		* An ordered list of Filters to apply to the table. To update, call applyFilter(). Note that this getter will
+		* return the new value immediately, even though it may take a little time to update on the server. You may listen
+		* for the <b>filterchanged</b> event to know when to update the UI.
+		* @return {@link dh.FilterCondition} array
 		*/
-		get isClosed():boolean;
+		get filter():Array<FilterCondition>;
 		/**
-		* 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).
+		* The total count of the rows in the table, excluding any filters. Unlike <b>size</b>, changes to this value will
+		* not result in any event. <b>Sort[] sort</b> an ordered list of Sorts to apply to the table. To update, call
+		* applySort(). Note that this getter will return the new value immediately, even though it may take a little time
+		* to update on the server. You may listen for the <b>sortchanged</b> event to know when to update the UI.
 		* @return double
 		*/
-		get size():number;
+		get totalSize():number;
 		/**
-		* The columns that can be shown in this Tree Table.
-		* @return {@link dh.Column} array
+		* The total count of rows in the table. The size can and will change; see the <b>sizechanged</b> event for details.
+		* Size will be negative in exceptional cases (e.g., the table is uncoalesced; see the <b>isUncoalesced</b>
+		* property). for details).
+		* @return double
 		*/
-		get columns():Array<Column>;
+		get size():number;
 		/**
-		* The current sort configuration of this Tree Table
-		* @return {@link dh.Sort} array.
+		* True if this table has been closed.
+		* @return boolean
 		*/
-		get sort():Array<Sort>;
+		get isClosed():boolean;
 		/**
-		* True if this table may receive updates from the server, including size changed events, updated events after
-		* initial snapshot.
+		* Read-only. True if this table is uncoalesced. Set a viewport or filter on the partition columns to coalesce the
+		* table. Check the <b>isPartitionColumn</b> property on the table columns to retrieve the partition columns. Size
+		* will be unavailable until table is coalesced.
 		* @return boolean
 		*/
-		get isRefreshing():boolean;
+		get isUncoalesced():boolean;
 		/**
 		* Listen for events on this object.
 		* @param name - the name of the event to listen for
@@ -2097,6 +2093,22 @@ export namespace dh {
 		* @typeParam T - 
 		*/
 		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
+		/**
+		* a Sort than can be used to reverse a table. This can be passed into n array in applySort. Note that Tree Tables
+		* do not support reverse.
+		* @return {@link dh.Sort}
+		*/
+		static reverse():Sort;
+	}
+
+	/**
+	* Presently optional and not used by the server, this allows the client to specify some authentication details. String
+	* authToken <i>- base 64 encoded auth token. String serviceId -</i> The service ID to use for the connection.
+	*/
+	export class ConnectOptions {
+		headers:{ [key: string]: string; };
+
+		constructor();
 	}
 
 	/**
@@ -2188,6 +2200,51 @@ export namespace dh {
 		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
 	}
 
+	/**
+	* 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();
+
+		/**
+		* Builds a Sort instance to sort values in ascending order.
+		* @return {@link dh.Sort}
+		*/
+		asc():Sort;
+		/**
+		* Builds a Sort instance to sort values in descending order.
+		* @return {@link dh.Sort}
+		*/
+		desc():Sort;
+		/**
+		* Builds a Sort instance which takes the absolute value before applying order.
+		* @return {@link dh.Sort}
+		*/
+		abs():Sort;
+		toString():string;
+		/**
+		* True if the absolute value of the column should be used when sorting; defaults to false.
+		* @return boolean
+		*/
+		get isAbs():boolean;
+		/**
+		* The column which is sorted.
+		* @return {@link dh.Column}
+		*/
+		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 IdeSession implements HasEventHandling {
 		static readonly EVENT_COMMANDSTARTED:string;
 		static readonly EVENT_REQUEST_FAILED:string;
@@ -2256,132 +2313,44 @@ export namespace dh {
 		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
 	}
 
-	/**
-	* 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;
-		/**
-		* a new iterator over all indexes in this collection.
-		* @return Iterator of {@link dh.LongWrapper}
-		*/
-		iterator():Iterator<LongWrapper>;
-		/**
-		* 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
-		*/
-		get size():number;
-	}
-
-	export class LoginCredentials {
-		type?:string|null;
-		username?:string|null;
-		token?:string|null;
-
+	export class Ide {
 		constructor();
-	}
 
-	/**
-	* 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.
-	*/
-	export class IdeConnection implements HasEventHandling {
 		/**
 		* @deprecated
 		*/
-		static readonly HACK_CONNECTION_FAILURE:string;
-		static readonly EVENT_DISCONNECT:string;
-		static readonly EVENT_RECONNECT:string;
-		static readonly EVENT_SHUTDOWN:string;
-
+		getExistingSession(websocketUrl:string, authToken:string, serviceId:string, language:string):Promise<IdeSession>;
 		/**
-		* creates a new instance, from which console sessions can be made. <b>options</b> are optional.
-		* @param serverUrl - The url used when connecting to the server. Read-only.
-		* @param connectOptions - Optional Object
-		* @param fromJava - Optional boolean
 		* @deprecated
 		*/
-		constructor(serverUrl:string, connectOptions?:ConnectOptions, fromJava?:boolean);
+		static getExistingSession(websocketUrl:string, authToken:string, serviceId:string, language:string):Promise<IdeSession>;
+	}
 
+	/**
+	* 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.
+	*/
+	export class TreeTableConfig {
 		/**
-		* closes the current connection, releasing any resources on the server or client.
-		*/
-		close():void;
-		running():Promise<IdeConnection>;
-		getObject(definitionObject:dh.ide.VariableDescriptor):Promise<any>;
-		subscribeToFieldUpdates(callback:(arg0:dh.ide.VariableChanges)=>void):()=>void;
-		/**
-		* Register a callback function to handle any log messages that are emitted on the server. Returns a function ,
-		* which can be invoked to remove this log handler. Any log handler registered in this way will receive as many old
-		* log messages as are presently available.
-		* @param callback - 
-		* @return {@link io.deephaven.web.shared.fu.JsRunnable}
+		* The column representing the unique ID for each item
 		*/
-		onLogMessage(callback:(arg0:dh.ide.LogItem)=>void):()=>void;
-		startSession(type:string):Promise<IdeSession>;
-		getConsoleTypes():Promise<Array<string>>;
-		getWorkerHeapInfo():Promise<WorkerHeapInfo>;
+		idColumn: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
+		* The column representing the parent ID for each item
 		*/
-		addEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
-		hasListeners(name:string):boolean;
+		parentColumn:string;
 		/**
-		* Removes an event listener added to this table.
-		* @param name - 
-		* @param callback - 
-		* @return 
-		* @typeParam T - 
+		* Optional parameter indicating if items with an invalid parent ID should be promoted to root. Defaults to false.
 		*/
-		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
-	}
-
-
-	/**
-	* This enum describes the name of each supported operation/aggregation type when creating a `TreeTable`.
-	*/
-	type AggregationOperationType = string;
-	export class AggregationOperation {
-		static readonly COUNT:AggregationOperationType;
-		static readonly COUNT_DISTINCT:AggregationOperationType;
-		static readonly DISTINCT:AggregationOperationType;
-		static readonly MIN:AggregationOperationType;
-		static readonly MAX:AggregationOperationType;
-		static readonly SUM:AggregationOperationType;
-		static readonly ABS_SUM:AggregationOperationType;
-		static readonly VAR:AggregationOperationType;
-		static readonly AVG:AggregationOperationType;
-		static readonly STD:AggregationOperationType;
-		static readonly FIRST:AggregationOperationType;
-		static readonly LAST:AggregationOperationType;
-		static readonly UNIQUE:AggregationOperationType;
-		static readonly SKIP:AggregationOperationType;
-	}
-
-	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;
+		promoteOrphansToRoot:boolean;
+
+		constructor();
 	}
 
+
 	type SearchDisplayModeType = string;
 	export class SearchDisplayMode {
 		static readonly SEARCH_DISPLAY_DEFAULT:SearchDisplayModeType;
@@ -2405,6 +2374,37 @@ export namespace dh {
 		static readonly TREEMAP:VariableTypeType;
 	}
 
+	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;
+	}
+
+	/**
+	* This enum describes the name of each supported operation/aggregation type when creating a `TreeTable`.
+	*/
+	type AggregationOperationType = string;
+	export class AggregationOperation {
+		static readonly COUNT:AggregationOperationType;
+		static readonly COUNT_DISTINCT:AggregationOperationType;
+		static readonly DISTINCT:AggregationOperationType;
+		static readonly MIN:AggregationOperationType;
+		static readonly MAX:AggregationOperationType;
+		static readonly SUM:AggregationOperationType;
+		static readonly ABS_SUM:AggregationOperationType;
+		static readonly VAR:AggregationOperationType;
+		static readonly AVG:AggregationOperationType;
+		static readonly STD:AggregationOperationType;
+		static readonly FIRST:AggregationOperationType;
+		static readonly LAST:AggregationOperationType;
+		static readonly UNIQUE:AggregationOperationType;
+		static readonly SKIP:AggregationOperationType;
+	}
+
 }
 
 export namespace dh.ide {
@@ -2418,6 +2418,45 @@ 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;
+	}
+	/**
+	* 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>;
+	}
+	/**
 	* Represents a serialized fishlib LogRecord, suitable for display on javascript clients. A log entry sent from the
 	* server.
 	*/
@@ -2479,103 +2518,10 @@ 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;
-	}
 }
 
 export namespace dh.i18n {
 
-	/**
-	* Exported wrapper of the GWT NumberFormat, plus LongWrapper support
-	*
-	* Utility class to parse and format numbers, using the same format patterns as are supported by the standard Java
-	* implementation used in the Deephaven server and swing client. Works for numeric types including BigInteger and
-	* BigDecimal.
-	*/
-	export class NumberFormat {
-		/**
-		* Creates a new number format instance. This generally should be avoided in favor of the static `getFormat`
-		* function, which will create and cache an instance so that later calls share the same instance.
-		* @param pattern - 
-		*/
-		constructor(pattern:string);
-
-		/**
-		* a number format instance matching the specified format. If this format has not been specified before, a new
-		* instance will be created and cached for later reuse. Prefer this method to calling the constructor directly to
-		* take advantage of caching
-		* @param pattern - 
-		* @return dh.i18n.NumberFormat
-		*/
-		static getFormat(pattern:string):NumberFormat;
-		/**
-		* Parses the given text using the cached format matching the given pattern.
-		* @param pattern - 
-		* @param text - 
-		* @return double
-		*/
-		static parse(pattern:string, text:string):number;
-		/**
-		* Formats the specified number (or Java <b>long</b>, <b>BigInteger</b> or <b>BigDecimal</b> value) using the cached
-		* format matching the given pattern string.
-		* @param pattern - 
-		* @param number - 
-		* @return String
-		*/
-		static format(pattern:string, number:number|dh.BigIntegerWrapper|dh.BigDecimalWrapper|dh.LongWrapper):string;
-		/**
-		* Parses the given text using this instance's pattern into a JS Number.
-		* @param text - 
-		* @return double
-		*/
-		parse(text:string):number;
-		/**
-		* Formats the specified number (or Java `long`, `BigInteger` or `BigDecimal` value) using this instance's pattern.
-		* @param number - 
-		* @return String
-		*/
-		format(number:number|dh.BigIntegerWrapper|dh.BigDecimalWrapper|dh.LongWrapper):string;
-		toString():string;
-	}
-
-
 	/**
 	* Largely an exported wrapper for the GWT DateFormat, but also includes support for formatting nanoseconds as an
 	* additional 6 decimal places after the rest of the number.
@@ -2768,27 +2714,125 @@ export namespace dh.i18n {
 		protected constructor();
 
 		/**
-		* Factory method which creates timezone instances from one of the supported keys.
-		* @param tzCode - 
-		* @return dh.i18n.TimeZone
+		* Factory method which creates timezone instances from one of the supported keys.
+		* @param tzCode - 
+		* @return dh.i18n.TimeZone
+		*/
+		static getTimeZone(tzCode:string):TimeZone;
+		/**
+		* the standard offset of this timezone, in minutes
+		* @return int
+		*/
+		get standardOffset():number;
+		/**
+		* the timezone code that represents this `TimeZone`, usually the same key as was use to create this instance
+		* @return String
+		*/
+		get id():string;
+	}
+
+	/**
+	* Exported wrapper of the GWT NumberFormat, plus LongWrapper support
+	*
+	* Utility class to parse and format numbers, using the same format patterns as are supported by the standard Java
+	* implementation used in the Deephaven server and swing client. Works for numeric types including BigInteger and
+	* BigDecimal.
+	*/
+	export class NumberFormat {
+		/**
+		* Creates a new number format instance. This generally should be avoided in favor of the static `getFormat`
+		* function, which will create and cache an instance so that later calls share the same instance.
+		* @param pattern - 
+		*/
+		constructor(pattern:string);
+
+		/**
+		* a number format instance matching the specified format. If this format has not been specified before, a new
+		* instance will be created and cached for later reuse. Prefer this method to calling the constructor directly to
+		* take advantage of caching
+		* @param pattern - 
+		* @return dh.i18n.NumberFormat
+		*/
+		static getFormat(pattern:string):NumberFormat;
+		/**
+		* Parses the given text using the cached format matching the given pattern.
+		* @param pattern - 
+		* @param text - 
+		* @return double
+		*/
+		static parse(pattern:string, text:string):number;
+		/**
+		* Formats the specified number (or Java <b>long</b>, <b>BigInteger</b> or <b>BigDecimal</b> value) using the cached
+		* format matching the given pattern string.
+		* @param pattern - 
+		* @param number - 
+		* @return String
+		*/
+		static format(pattern:string, number:number|dh.BigIntegerWrapper|dh.BigDecimalWrapper|dh.LongWrapper):string;
+		/**
+		* Parses the given text using this instance's pattern into a JS Number.
+		* @param text - 
+		* @return double
+		*/
+		parse(text:string):number;
+		/**
+		* Formats the specified number (or Java `long`, `BigInteger` or `BigDecimal` value) using this instance's pattern.
+		* @param number - 
+		* @return String
+		*/
+		format(number:number|dh.BigIntegerWrapper|dh.BigDecimalWrapper|dh.LongWrapper):string;
+		toString():string;
+	}
+
+
+}
+
+export namespace dh.plot {
+
+	/**
+	* Provides access to the data for displaying in a figure.
+	*/
+	export interface Series {
+		readonly isLinesVisible?:boolean|null;
+		readonly pointLabelFormat?:string|null;
+		readonly yToolTipPattern?:string|null;
+		readonly shapeSize?:number|null;
+		readonly xToolTipPattern?:string|null;
+		readonly isShapesVisible?:boolean|null;
+
+		subscribe(forceDisableDownsample?:DownsampleOptions):void;
+		/**
+		* Disable updates for this Series.
+		*/
+		unsubscribe():void;
+		get shape():string;
+		/**
+		* Contains details on how to access data within the chart for this series. keyed with the way that this series uses
+		* the axis.
+		* @return {@link dh.plot.SeriesDataSource}
 		*/
-		static getTimeZone(tzCode:string):TimeZone;
+		get sources():SeriesDataSource[];
+		get lineColor():string;
 		/**
-		* the standard offset of this timezone, in minutes
+		* The plotting style to use for this series. See <b>SeriesPlotStyle</b> enum for more details.
 		* @return int
 		*/
-		get standardOffset():number;
+		get plotStyle():SeriesPlotStyleType;
+		get oneClick():OneClick;
+		get gradientVisible():boolean;
+		get shapeColor():string;
 		/**
-		* the timezone code that represents this `TimeZone`, usually the same key as was use to create this instance
+		* The name for this series.
 		* @return String
 		*/
-		get id():string;
+		get name():string;
+		/**
+		* indicates that this series belongs to a MultiSeries, null otherwise
+		* @return dh.plot.MultiSeries
+		*/
+		get multiSeries():MultiSeries;
+		get shapeLabel():string;
 	}
-
-}
-
-export namespace dh.plot {
-
 	/**
 	* Defines one axis used with by series. These instances will be found both on the Chart and the Series instances, and
 	* may be shared between Series instances.
@@ -2858,26 +2902,6 @@ export namespace dh.plot {
 		get minRange():number;
 	}
 	/**
-	* Describes how to access and display data required within a series.
-	*/
-	export interface SeriesDataSource {
-		/**
-		* the type of data stored in the underlying table's Column.
-		* @return String
-		*/
-		get columnType():string;
-		/**
-		* the axis that this source should be drawn on.
-		* @return dh.plot.Axis
-		*/
-		get axis():Axis;
-		/**
-		* the feature of this series represented by this source. See the <b>SourceType</b> enum for more details.
-		* @return int
-		*/
-		get type():SourceTypeType;
-	}
-	/**
 	* Describes a template that will be used to make new series instances when a new table added to a plotBy.
 	*/
 	export interface MultiSeries {
@@ -2892,83 +2916,54 @@ export namespace dh.plot {
 		*/
 		get plotStyle():SeriesPlotStyleType;
 	}
+	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[];
+	}
 	/**
-	* Provides access to the data for displaying in a figure.
+	* Describes how to access and display data required within a series.
 	*/
-	export interface Series {
-		readonly isLinesVisible?:boolean|null;
-		readonly pointLabelFormat?:string|null;
-		readonly yToolTipPattern?:string|null;
-		readonly shapeSize?:number|null;
-		readonly xToolTipPattern?:string|null;
-		readonly isShapesVisible?:boolean|null;
-
-		subscribe(forceDisableDownsample?:DownsampleOptions):void;
+	export interface SeriesDataSource {
 		/**
-		* Disable updates for this Series.
+		* the type of data stored in the underlying table's Column.
+		* @return String
 		*/
-		unsubscribe():void;
-		get shape():string;
+		get columnType():string;
 		/**
-		* Contains details on how to access data within the chart for this series. keyed with the way that this series uses
-		* the axis.
-		* @return {@link dh.plot.SeriesDataSource}
+		* the axis that this source should be drawn on.
+		* @return dh.plot.Axis
 		*/
-		get sources():SeriesDataSource[];
-		get lineColor():string;
+		get axis():Axis;
 		/**
-		* The plotting style to use for this series. See <b>SeriesPlotStyle</b> enum for more details.
+		* the feature of this series represented by this source. See the <b>SourceType</b> enum for more details.
 		* @return int
 		*/
-		get plotStyle():SeriesPlotStyleType;
-		get oneClick():OneClick;
-		get gradientVisible():boolean;
-		get shapeColor():string;
-		/**
-		* The name for this series.
-		* @return String
-		*/
-		get name():string;
-		/**
-		* indicates that this series belongs to a MultiSeries, null otherwise
-		* @return dh.plot.MultiSeries
-		*/
-		get multiSeries():MultiSeries;
-		get shapeLabel():string;
-	}
-	export interface FigureDataUpdatedEvent {
-		getArray(series:Series, sourceType:number, mappingFunc?:(arg0:any)=>any):Array<any>;
-		get series():Series[];
-	}
-	export interface OneClick {
-		setValueForColumn(columnName:string, value:any):void;
-		getValueForColumn(columName:string):any;
-		get requireAllFiltersToDisplay():boolean;
-		get columns():dh.Column[];
+		get type():SourceTypeType;
 	}
 
-	export class AxisDescriptor {
-		formatType:string;
-		type:string;
-		position:string;
-		log?:boolean|null;
-		label?:string|null;
-		labelFont?:string|null;
-		ticksFont?:string|null;
-		formatPattern?:string|null;
-		color?:string|null;
-		minRange?:number|null;
-		maxRange?:number|null;
-		minorTicksVisible?:boolean|null;
-		majorTicksVisible?:boolean|null;
-		minorTickCount?:number|null;
-		gapBetweenMajorTicks?:number|null;
-		majorTickLocations?:Array<number>|null;
-		tickLabelAngle?:number|null;
-		invert?:boolean|null;
-		isTimeAxis?:boolean|null;
+	/**
+	* Helper class for plot downsampling methods.
+	*/
+	export class Downsample {
+		protected constructor();
 
-		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>;
 	}
 
 	/**
@@ -3091,6 +3086,61 @@ export namespace dh.plot {
 		static create(config:FigureDescriptor):Promise<Figure>;
 	}
 
+	export class FigureSourceException {
+		table:dh.Table;
+		source:SeriesDataSource;
+
+		protected constructor();
+	}
+
+	export class AxisDescriptor {
+		formatType:string;
+		type:string;
+		position:string;
+		log?:boolean|null;
+		label?:string|null;
+		labelFont?:string|null;
+		ticksFont?:string|null;
+		formatPattern?:string|null;
+		color?:string|null;
+		minRange?:number|null;
+		maxRange?:number|null;
+		minorTicksVisible?:boolean|null;
+		majorTicksVisible?:boolean|null;
+		minorTickCount?:number|null;
+		gapBetweenMajorTicks?:number|null;
+		majorTickLocations?:Array<number>|null;
+		tickLabelAngle?:number|null;
+		invert?:boolean|null;
+		isTimeAxis?: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();
+	}
+
+	export class FigureFetchError {
+		error:object;
+		errors:Array<string>;
+
+		protected constructor();
+	}
+
 	/**
 	* Provide the details for a chart.
 	*/
@@ -3130,67 +3180,16 @@ export namespace dh.plot {
 		*/
 		get chartType():ChartTypeType;
 		get row():number;
-		get legendColor():string;
-		get legendFont():string;
-		get multiSeries():MultiSeries[];
-	}
-
-	export class DownsampleOptions {
-		/**
-		* Max number of items in the series before DEFAULT will not attempt to load the series without downsampling. Above
-		* this size if downsample fails or is not applicable, the series won't be loaded unless DISABLE is passed to
-		* series.subscribe().
-		*/
-		static MAX_SERIES_SIZE:number;
-		/**
-		* Max number of items in the series where the subscription will be allowed at all. Above this limit, even with
-		* downsampling disabled, the series will not load data.
-		*/
-		static MAX_SUBSCRIPTION_SIZE:number;
-		/**
-		* Flag to let the API decide what data will be available, based on the nature of the data, the series, and how the
-		* axes are configured.
-		*/
-		static readonly DEFAULT:DownsampleOptions;
-		/**
-		* Flat to entirely disable downsampling, and force all data to load, no matter how many items that would be, up to
-		* the limit of MAX_SUBSCRIPTION_SIZE.
-		*/
-		static readonly DISABLE:DownsampleOptions;
-
-		protected 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();
+		get legendColor():string;
+		get legendFont():string;
+		get multiSeries():MultiSeries[];
 	}
 
-	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;
+	export class SourceDescriptor {
+		axis:AxisDescriptor;
+		table:dh.Table;
+		columnName:string;
+		type:string;
 
 		constructor();
 	}
@@ -3212,13 +3211,6 @@ export namespace dh.plot {
 		removeColumn(columnName:string, mappingFunc:(arg0:any)=>any):void;
 	}
 
-	export class FigureSourceException {
-		table:dh.Table;
-		source:SeriesDataSource;
-
-		protected constructor();
-	}
-
 	export class SeriesDescriptor {
 		plotStyle:string;
 		name?:string|null;
@@ -3238,13 +3230,6 @@ export namespace dh.plot {
 		constructor();
 	}
 
-	export class FigureFetchError {
-		error:object;
-		errors:Array<string>;
-
-		protected constructor();
-	}
-
 	export class SeriesDataSourceException {
 		protected constructor();
 
@@ -3252,48 +3237,73 @@ export namespace dh.plot {
 		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();
-
+	export class DownsampleOptions {
 		/**
-		* 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.
+		* Max number of items in the series before DEFAULT will not attempt to load the series without downsampling. Above
+		* this size if downsample fails or is not applicable, the series won't be loaded unless DISABLE is passed to
+		* series.subscribe().
 		*/
-		static runChartDownsample(table:dh.Table, xCol:string, yCols:string[], width:number, xRange?:dh.LongWrapper[]|undefined|null):Promise<dh.Table>;
+		static MAX_SERIES_SIZE:number;
+		/**
+		* Max number of items in the series where the subscription will be allowed at all. Above this limit, even with
+		* downsampling disabled, the series will not load data.
+		*/
+		static MAX_SUBSCRIPTION_SIZE:number;
+		/**
+		* Flag to let the API decide what data will be available, based on the nature of the data, the series, and how the
+		* axes are configured.
+		*/
+		static readonly DEFAULT:DownsampleOptions;
+		/**
+		* Flat to entirely disable downsampling, and force all data to load, no matter how many items that would be, up to
+		* the limit of MAX_SUBSCRIPTION_SIZE.
+		*/
+		static readonly DISABLE:DownsampleOptions;
+
+		protected constructor();
 	}
 
 
-	type AxisFormatTypeType = number;
-	export class AxisFormatType {
-		static readonly CATEGORY:AxisFormatTypeType;
-		static readonly NUMBER:AxisFormatTypeType;
+	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 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;
+	/**
+	* This enum describes what kind of chart is being drawn. This may limit what kinds of series can be found on it, or how
+	* those series should be rendered.
+	*/
+	type ChartTypeType = number;
+	export class ChartType {
+		static readonly XY:ChartTypeType;
+		static readonly PIE:ChartTypeType;
+		static readonly OHLC:ChartTypeType;
+		static readonly CATEGORY:ChartTypeType;
+		static readonly XYZ:ChartTypeType;
+		static readonly CATEGORY_3D:ChartTypeType;
+		static readonly TREEMAP:ChartTypeType;
 	}
 
 	type SeriesPlotStyleType = number;
@@ -3312,19 +3322,13 @@ export namespace dh.plot {
 		static readonly TREEMAP:SeriesPlotStyleType;
 	}
 
-	/**
-	* This enum describes what kind of chart is being drawn. This may limit what kinds of series can be found on it, or how
-	* those series should be rendered.
-	*/
-	type ChartTypeType = number;
-	export class ChartType {
-		static readonly XY:ChartTypeType;
-		static readonly PIE:ChartTypeType;
-		static readonly OHLC:ChartTypeType;
-		static readonly CATEGORY:ChartTypeType;
-		static readonly XYZ:ChartTypeType;
-		static readonly CATEGORY_3D:ChartTypeType;
-		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;
 	}
 
 	/**
@@ -3356,52 +3360,34 @@ export namespace dh.plot {
 		static readonly HOVER_TEXT:SourceTypeType;
 	}
 
-	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;
 	}
 
 }
 
 export namespace dh.lsp {
 
-	export class ParameterInformation {
-		label:string;
-		documentation:MarkupContent;
-
-		constructor();
-	}
-
-	export class Range {
-		start:Position;
-		end:Position;
+	export class TextDocumentContentChangeEvent {
+		range:Range;
+		rangeLength:number;
+		text:string;
 
 		constructor();
-
-		isInside(innerStart:Position, innerEnd:Position):boolean;
 	}
 
-	export class Position {
-		line:number;
-		character:number;
+	export class Hover {
+		contents:MarkupContent;
+		range:Range;
 
 		constructor();
-
-		lessThan(start:Position):boolean;
-		lessOrEqual(start:Position):boolean;
-		greaterThan(end:Position):boolean;
-		greaterOrEqual(end:Position):boolean;
-		copy():Position;
 	}
 
-	export class MarkupContent {
-		kind:string;
-		value:string;
+	export class TextEdit {
+		range:Range;
+		text:string;
 
 		constructor();
 	}
@@ -3423,41 +3409,67 @@ export namespace dh.lsp {
 		constructor();
 	}
 
-	export class TextDocumentContentChangeEvent {
-		range:Range;
-		rangeLength:number;
-		text:string;
+	export class ParameterInformation {
+		label:string;
+		documentation:MarkupContent;
 
 		constructor();
 	}
 
-	export class TextEdit {
-		range:Range;
-		text:string;
+	export class SignatureInformation {
+		label:string;
+		documentation:MarkupContent;
+		parameters:Array<ParameterInformation>;
+		activeParameter:number;
 
 		constructor();
 	}
 
-	export class Hover {
-		contents:MarkupContent;
-		range:Range;
+	export class MarkupContent {
+		kind:string;
+		value:string;
 
 		constructor();
 	}
 
-	export class SignatureInformation {
-		label:string;
-		documentation:MarkupContent;
-		parameters:Array<ParameterInformation>;
-		activeParameter:number;
+	export class Range {
+		start:Position;
+		end:Position;
+
+		constructor();
+
+		isInside(innerStart:Position, innerEnd:Position):boolean;
+	}
+
+	export class Position {
+		line:number;
+		character:number;
 
 		constructor();
+
+		lessThan(start:Position):boolean;
+		lessOrEqual(start:Position):boolean;
+		greaterThan(end:Position):boolean;
+		greaterOrEqual(end:Position):boolean;
+		copy():Position;
 	}
 
 }
 
 export namespace dh.calendar {
 
+	export interface Holiday {
+		/**
+		* The date of the Holiday.
+		* @return {@link dh.LocalDateWrapper}
+		*/
+		get date():dh.LocalDateWrapper;
+		/**
+		* The business periods that are open on the holiday.
+		* @return dh.calendar.BusinessPeriod
+		*/
+		get businessPeriods():Array<BusinessPeriod>;
+	}
 	/**
 	* Defines a calendar with business hours and holidays.
 	*/
@@ -3488,18 +3500,6 @@ export namespace dh.calendar {
 		*/
 		get businessPeriods():Array<BusinessPeriod>;
 	}
-	export interface Holiday {
-		/**
-		* The date of the Holiday.
-		* @return {@link dh.LocalDateWrapper}
-		*/
-		get date():dh.LocalDateWrapper;
-		/**
-		* The business periods that are open on the holiday.
-		* @return dh.calendar.BusinessPeriod
-		*/
-		get businessPeriods():Array<BusinessPeriod>;
-	}
 	export interface BusinessPeriod {
 		get close():string;
 		get open():string;