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

package/dist/index.d.ts

@@ -117,94 +117,10 @@ export namespace dh.storage {
 
 export namespace dh {
 
-	/**
-	* 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 {
-		/**
-		* 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
-		*/
-		get isExpanded():boolean;
-		/**
-		* 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
-		*/
-		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;
-	}
-	/**
-	* 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 WidgetMessageDetails {
-		/**
-		* Returns the data from this message as a base64-encoded string.
-		*/
-		getDataAsBase64():string;
-		/**
-		* Returns the data from this message as a Uint8Array.
-		*/
-		getDataAsU8():Uint8Array;
-		/**
-		* Returns the data from this message as a utf-8 string.
-		*/
-		getDataAsString():string;
-		/**
-		* Returns an array of exported objects sent from the server. The plugin implementation is now responsible for these
-		* objects, and should close them when no longer needed.
-		*/
-		get exportedObjects():WidgetExportedObject[];
-	}
-	export interface Row {
-		get(column:Column):any;
-		getFormat(column:Column):Format;
-		get index():LongWrapper;
-	}
-	export interface LayoutHints {
-		readonly searchDisplayMode?:SearchDisplayModeType|null;
-
-		get hiddenColumns():string[]|null;
-		get frozenColumns():string[]|null;
-		get columnGroups():ColumnGroup[]|null;
-		get areSavedLayoutsAllowed():boolean;
-		get frontColumns():string[]|null;
-		get backColumns():string[]|null;
-	}
-	/**
-	* 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 ViewportData extends TableData {
-		/**
-		* The index of the first returned row
-		* @return double
-		*/
-		get offset():number;
-		/**
-		* A list of columns describing the data types in each row
-		* @return {@link dh.Column} array.
-		*/
-		get columns():Array<Column>;
-		/**
-		* An array of rows of data
-		* @return {@link dh.ViewportRow} array.
-		*/
-		get rows():Array<ViewportRow>;
+	export interface ColumnGroup {
+		get name():string|null;
+		get children():string[]|null;
+		get color():string|null;
 	}
 	/**
 	* Behaves like a Table, but doesn't expose all of its API for changing the internal state. Instead, state is driven by
@@ -348,6 +264,16 @@ export namespace dh {
 		get columns():Array<Column>;
 		get rows():Array<Row>;
 	}
+	export interface LayoutHints {
+		readonly searchDisplayMode?:SearchDisplayModeType|null;
+
+		get hiddenColumns():string[]|null;
+		get frozenColumns():string[]|null;
+		get columnGroups():ColumnGroup[]|null;
+		get areSavedLayoutsAllowed():boolean;
+		get frontColumns():string[]|null;
+		get backColumns():string[]|null;
+	}
 	/**
 	* 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.
@@ -393,75 +319,6 @@ export namespace dh {
 		getViewportData():Promise<TableData>;
 		snapshot(rows:RangeSet, columns:Column[]):Promise<TableData>;
 	}
-	/**
-	* This object may be pooled internally or discarded and not updated. Do not retain references to it.
-	*/
-	export interface Format {
-		/**
-		* The format string to apply to the value of this cell.
-		* @return String
-		*/
-		readonly formatString?:string|null;
-		/**
-		* Color to apply to the cell's background, in <b>#rrggbb</b> format.
-		* @return String
-		*/
-		readonly backgroundColor?:string|null;
-		/**
-		* Color to apply to the text, in <b>#rrggbb</b> format.
-		* @return String
-		*/
-		readonly color?:string|null;
-		/**
-		* 
-		* @deprecated Prefer formatString. Number format string to apply to the value in this cell.
-		*/
-		readonly numberFormat?:string|null;
-	}
-	/**
-	* 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;
-	}
-	/**
-	* 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 ColumnStatistics {
-		/**
-		* Gets the type of formatting that should be used for given statistic.
-		* <p>
-		* the format type for a statistic. A null return value means that the column formatting should be used.
-		* @param name - the display name of the statistic
-		* @return String
-		*/
-		getType(name:string):string;
-		/**
-		* Gets a map with the name of each unique value as key and the count as the value. A map of each unique value's
-		* name to the count of how many times it occurred in the column. This map will be empty for tables containing more
-		* than 19 unique values.
-		* @return Map of String double
-		*/
-		get uniqueValues():Map<string, 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
-		*/
-		get statisticsMap():Map<string, object>;
-	}
-	export interface ColumnGroup {
-		get name():string|null;
-		get children():string[]|null;
-		get color():string|null;
-	}
 	export interface WorkerHeapInfo {
 		/**
 		* Total heap size available for this worker.
@@ -470,57 +327,6 @@ export namespace dh {
 		get freeMemory():number;
 		get maximumHeapSize():number;
 	}
-	export interface RefreshToken {
-		get bytes():string;
-		get expiry():number;
-	}
-	/**
-	* Wrap LocalDate values for use in JS. Provides text formatting for display and access to the underlying value.
-	*/
-	export interface LocalDateWrapper {
-		valueOf():string;
-		getYear():number;
-		getMonthValue():number;
-		getDayOfMonth():number;
-		toString():string;
-	}
-	/**
-	* Represents a server-side object that may not yet have been fetched by the client. When this object will no longer be
-	* 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 WidgetExportedObject {
-		/**
-		* 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.
-		*/
-		readonly type?: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.
-		*/
-		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 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.
@@ -555,32 +361,34 @@ export namespace dh {
 		get modified():RangeSet;
 		get rows():Array<Row>;
 	}
-	export interface HasEventHandling {
+	export interface RefreshToken {
+		get bytes():string;
+		get expiry():number;
+	}
+	/**
+	* This object may be pooled internally or discarded and not updated. Do not retain references to it.
+	*/
+	export interface Format {
 		/**
-		* 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 format string to apply to the value of this cell.
+		* @return String
 		*/
-		addEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
-		hasListeners(name:string):boolean;
+		readonly formatString?:string|null;
 		/**
-		* Removes an event listener added to this table.
-		* @param name - 
-		* @param callback - 
-		* @return 
-		* @typeParam T - 
+		* Color to apply to the cell's background, in <b>#rrggbb</b> format.
+		* @return String
 		*/
-		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
-	}
-	/**
-	* This object may be pooled internally or discarded and not updated. Do not retain references to it. Instead, request
-	* the viewport again.
-	*/
-	export interface ViewportRow extends Row {
-		get index():LongWrapper;
+		readonly backgroundColor?:string|null;
+		/**
+		* Color to apply to the text, in <b>#rrggbb</b> format.
+		* @return String
+		*/
+		readonly color?:string|null;
+		/**
+		* 
+		* @deprecated Prefer formatString. Number format string to apply to the value in this cell.
+		*/
+		readonly numberFormat?:string|null;
 	}
 	/**
 	* Represents a table which can be joined to another table. Current implementations are {@link dh.Table} and
@@ -671,300 +479,203 @@ export namespace dh {
 		*/
 		naturalJoin(rightTable:JoinableTable, columnsToMatch:Array<string>, columnsToAdd?:Array<string>|undefined|null):Promise<Table>;
 	}
-
-	/**
-	* Event fired when a command is issued from the client.
-	*/
-	export class CommandInfo {
-		constructor(code:string, result:Promise<dh.ide.CommandResult>);
-
-		get result():Promise<dh.ide.CommandResult>;
-		get code():string;
-	}
-
 	/**
-	* Deprecated for use in Deephaven Core.
-	* @deprecated
+	* 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 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 interface TreeRow extends ViewportRow {
 		/**
-		* @deprecated
+		* 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
 		*/
-		getExistingSession(websocketUrl:string, authToken:string, serviceId:string, language:string):Promise<IdeSession>;
+		get isExpanded():boolean;
 		/**
-		* @deprecated
+		* 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
 		*/
-		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;
+		get depth():number;
 		/**
-		* The expression to evaluate this custom column.
-		* @return String
+		* 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 expression():string;
+		get hasChildren():boolean;
+		get index():LongWrapper;
+	}
+	export interface HasEventHandling {
 		/**
-		* The name of the column to use.
-		* @return 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
 		*/
-		get name():string;
+		addEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):()=>void;
+		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
+		hasListeners(name:string):boolean;
 		/**
-		* 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
+		* Removes an event listener added to this table.
+		* @param name - 
+		* @param callback - 
+		* @return 
+		* @typeParam T - 
 		*/
-		get type():string;
+		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
 	}
-
 	/**
-	* Represents a non-viewport subscription to a table, and all data currently known to be present in the subscribed
-	* columns. This class handles incoming snapshots and deltas, and fires events to consumers to notify of data changes.
-	*
-	* 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.
+	* 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 class TableSubscription implements HasEventHandling {
+	export interface ViewportData extends TableData {
 		/**
-		* 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.
+		* The index of the first returned row
+		* @return double
 		*/
-		static readonly EVENT_UPDATED:string;
-
-		protected constructor();
-
+		get offset():number;
 		/**
-		* Stops the subscription on the server.
+		* A list of columns describing the data types in each row
+		* @return {@link dh.Column} array.
 		*/
-		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;
+		get columns():Array<Column>;
 		/**
-		* The columns that were subscribed to when this subscription was created
-		* @return {@link dh.Column}
+		* An array of rows of data
+		* @return {@link dh.ViewportRow} array.
 		*/
-		get columns():Array<Column>;
+		get rows():Array<ViewportRow>;
+	}
+	export interface Row {
+		get(column:Column):any;
+		getFormat(column:Column):Format;
+		get index():LongWrapper;
 	}
-
 	/**
-	* 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.
+	* 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.
 	*
-	* To view the results of the Input Table, you should use standard table operations on the InputTable's source Table
-	* object.
+	* 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 class InputTable {
-		protected constructor();
-
-		/**
-		* Adds a single row to the table. For each key or value column name in the Input Table, we retrieve that javascript
-		* property at that name and validate it can be put into the given column type.
-		* @param row - 
-		* @param userTimeZone - 
-		* @return Promise of dh.InputTable
-		*/
-		addRow(row:{ [key: string]: any; }, userTimeZone?:string):Promise<InputTable>;
+	export interface WidgetMessageDetails {
 		/**
-		* Add multiple rows to a table.
-		* @param rows - 
-		* @param userTimeZone - 
-		* @return Promise of dh.InputTable
+		* Returns the data from this message as a base64-encoded string.
 		*/
-		addRows(rows:{ [key: string]: any; }[], userTimeZone?:string):Promise<InputTable>;
+		getDataAsBase64():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
+		* Returns the data from this message as a Uint8Array.
 		*/
-		addTable(tableToAdd:Table):Promise<InputTable>;
+		getDataAsU8():Uint8Array;
 		/**
-		* Add multiple tables to this Input Table.
-		* @param tablesToAdd - 
-		* @return Promise of dh.InputTable
+		* Returns the data from this message as a utf-8 string.
 		*/
-		addTables(tablesToAdd:Table[]):Promise<InputTable>;
+		getDataAsString():string;
 		/**
-		* Deletes an entire table from this Input Table. Key columns must match the Input Table.
-		* @param tableToDelete - 
-		* @return Promise of dh.InputTable
+		* 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.
 		*/
-		deleteTable(tableToDelete:Table):Promise<InputTable>;
+		get exportedObjects():WidgetExportedObject[];
+	}
+	/**
+	* This object may be pooled internally or discarded and not updated. Do not retain references to it. Instead, request
+	* the viewport again.
+	*/
+	export interface ViewportRow extends Row {
+		get index():LongWrapper;
+	}
+	/**
+	* 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;
+	}
+	/**
+	* 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 ColumnStatistics {
 		/**
-		* Delete multiple tables from this Input Table.
-		* @param tablesToDelete - 
-		* @return 
+		* 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
 		*/
-		deleteTables(tablesToDelete:Table[]):Promise<InputTable>;
+		getType(name:string):string;
 		/**
-		* A list of the key columns, by name
-		* @return String array.
+		* 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 keys():string[];
+		get uniqueValues():Map<string, number>;
 		/**
-		* A list of the value columns, by name
-		* @return String array.
+		* 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 values():string[];
-		/**
-		* A list of the key columns.
-		* @return Column array.
-		*/
-		get keyColumns():Column[];
-		/**
-		* A list of the value Column objects
-		* @return {@link dh.Column} array.
-		*/
-		get valueColumns():Column[];
-		/**
-		* The source table for this Input Table
-		* @return dh.table
-		*/
-		get table():Table;
-	}
-
-	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();
-	}
-
-	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;
-	}
-
-	/**
-	* 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 {
-		protected constructor();
-
-		static ofJsDate(date:Date):DateWrapper;
-		asDate():Date;
+		get statisticsMap():Map<string, object>;
 	}
-
 	/**
-	* Wrap BigInteger values for use in JS. Provides text formatting for display and access to the underlying value.
+	* 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 class BigIntegerWrapper {
-		protected constructor();
-
-		static ofString(str:string):BigIntegerWrapper;
-		asNumber():number;
-		valueOf():string;
-		toString():string;
-	}
+	export interface WidgetExportedObject {
+		/**
+		* 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.
+		*/
+		readonly type?:string|null;
 
-	/**
-	* 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
+		* 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.
 		*/
-		idColumn:string;
+		reexport():Promise<WidgetExportedObject>;
 		/**
-		* The column representing the parent ID for each item
+		* 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.
 		*/
-		parentColumn:string;
+		fetch():Promise<any>;
 		/**
-		* Optional parameter indicating if items with an invalid parent ID should be promoted to root. Defaults to false.
+		* 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.
 		*/
-		promoteOrphansToRoot:boolean;
-
-		constructor();
+		close():void;
+	}
+	export interface TreeViewportData extends TableData {
+		get offset():number;
+		get columns():Array<Column>;
+		get rows():Array<TreeRow>;
 	}
-
 	/**
-	* 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.
+	* Wrap LocalDate values for use in JS. Provides text formatting for display and access to the underlying value.
 	*/
-	export class ConnectOptions {
-		headers:{ [key: string]: string; };
+	export interface LocalDateWrapper {
+		valueOf():string;
+		getYear():number;
+		getMonthValue():number;
+		getDayOfMonth():number;
+		toString():string;
+	}
+
+	export class LoginCredentials {
+		type?:string|null;
+		username?:string|null;
+		token?:string|null;
 
 		constructor();
 	}
@@ -1053,186 +764,55 @@ export namespace dh {
 		toString():string;
 	}
 
-	export class LongWrapper {
-		protected constructor();
-
-		static ofString(str:string):LongWrapper;
-		asNumber():number;
-		valueOf():string;
-		toString():string;
-	}
-
 	/**
-	* Describes a grouping and aggregations for a roll-up table. Pass to the <b>Table.rollup</b> function to create a
-	* roll-up table.
+	* 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 RollupConfig {
+	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;
+
+		protected constructor();
+
+		batch(userCode:(arg0:unknown)=>void):Promise<Table>;
 		/**
-		* Ordered list of columns to group by to form the hierarchy of the resulting roll-up 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}
 		*/
-		groupingColumns:Array<String>;
+		findColumn(key:string):Column;
 		/**
-		* Mapping from each aggregation name to the ordered list of columns it should be applied to in the resulting
-		* roll-up table.
+		* Retrieve multiple columns specified by the given names.
+		* @param keys - 
+		* @return {@link dh.Column} array
 		*/
-		aggregations:{ [key: string]: Array<AggregationOperationType>; };
+		findColumns(keys:string[]):Column[];
+		isBlinkTable():boolean;
 		/**
-		* 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.
+		* 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
 		*/
-		includeConstituents:boolean;
-		includeOriginalColumns?:boolean|null;
+		inputTable():Promise<InputTable>;
 		/**
-		* Optional parameter indicating if original column descriptions should be included. Defaults to true.
-		*/
-		includeDescriptions:boolean;
-
-		constructor();
-	}
-
-	/**
-	* A Widget represents a server side object that sends one or more responses to the client. The client can then
-	* interpret these responses to see what to render, or how to respond.
-	* <p>
-	* Most custom object types result in a single response being sent to the client, often with other exported objects, but
-	* some will have streamed responses, and allow the client to send follow-up requests of its own. This class's API is
-	* backwards compatible, but as such does not offer a way to tell the difference between a streaming or non-streaming
-	* object type, the client code that handles the payloads is expected to know what to expect. See
-	* {@link dh.WidgetMessageDetails} for more information.
-	* <p>
-	* When the promise that returns this object resolves, it will have the first response assigned to its fields. Later
-	* responses from the server will be emitted as "message" events. When the connection with the server ends, the "close"
-	* event will be emitted. In this way, the connection will behave roughly in the same way as a WebSocket - either side
-	* can close, and after close no more messages will be processed. There can be some latency in closing locally while
-	* remote messages are still pending - it is up to implementations of plugins to handle this case.
-	* <p>
-	* Also like WebSockets, the plugin API doesn't define how to serialize messages, and just handles any binary payloads.
-	* What it does handle however, is allowing those messages to include references to server-side objects with those
-	* payloads. Those server side objects might be tables or other built-in types in the Deephaven JS API, or could be
-	* objects usable through their own plugins. They also might have no plugin at all, allowing the client to hold a
-	* reference to them and pass them back to the server, either to the current plugin instance, or through another API.
-	* The `Widget` type does not specify how those objects should be used or their lifecycle, but leaves that
-	* entirely to the plugin. Messages will arrive in the order they were sent.
-	* <p>
-	* This can suggest several patterns for how plugins operate:
-	* <ul>
-	* <li>The plugin merely exists to transport some other object to the client. This can be useful for objects which can
-	* easily be translated to some other type (like a Table) when the user clicks on it. An example of this is
-	* `pandas.DataFrame` will result in a widget that only contains a static
-	* {@link dh.Table}. Presently, the widget is immediately closed, and only the Table is
-	* provided to the JS API consumer.</li>
-	* <li>The plugin provides references to Tables and other objects, and those objects can live longer than the object
-	* which provided them. One concrete example of this could have been
-	* {@link dh.PartitionedTable} when fetching constituent tables, but it was implemented
-	* before bidirectional plugins were implemented. Another example of this is plugins that serve as a "factory", giving
-	* the user access to table manipulation/creation methods not supported by gRPC or the JS API.</li>
-	* <li>The plugin provides reference to Tables and other objects that only make sense within the context of the widget
-	* instance, so when the widget goes away, those objects should be released as well. This is also an example of
-	* {@link dh.PartitionedTable}, as the partitioned table tracks creation of new keys through
-	* an internal table instance.</li>
-	* </ul>
-	*
-	* Handling server objects in messages also has more than one potential pattern that can be used:
-	* <ul>
-	* <li>One object per message - the message clearly is about that object, no other details required.</li>
-	* <li>Objects indexed within their message - as each message comes with a list of objects, those objects can be
-	* referenced within the payload by index. This is roughly how {@link dh.plot.Figure}
-	* behaves, where the figure descriptor schema includes an index for each created series, describing which table should
-	* be used, which columns should be mapped to each axis.</li>
-	* <li>Objects indexed since widget creation - each message would append its objects to a list created when the widget
-	* was first made, and any new exports that arrive in a new message would be appended to that list. Then, subsequent
-	* messages can reference objects already sent. This imposes a limitation where the client cannot release any exports
-	* without the server somehow signaling that it will never reference that export again.</li>
-	* </ul>
-	*/
-	export class Widget implements WidgetMessageDetails, HasEventHandling {
-		static readonly EVENT_MESSAGE:string;
-		static readonly EVENT_CLOSE:string;
-
-		protected constructor();
-
-		/**
-		* Ends the client connection to the server.
-		*/
-		close():void;
-		getDataAsBase64():string;
-		getDataAsU8():Uint8Array;
-		getDataAsString():string;
-		/**
-		* Sends a string/bytes payload to the server, along with references to objects that exist on the server.
-		* @param msg - string/buffer/view instance that represents data to send
-		* @param references - an array of objects that can be safely sent to the server
-		*/
-		sendMessage(msg:string|ArrayBuffer|ArrayBufferView, references?:Array<Table|Widget|WidgetExportedObject|PartitionedTable|TotalsTable|TreeTable>):void;
-		addEventListener<T>(name:string, callback:(e: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;
-		/**
-		* 
-		* @return the exported objects sent in the initial message from the server. The client is responsible for closing
-		*         them when finished using them.
-		*/
-		get exportedObjects():WidgetExportedObject[];
-		/**
-		* 
-		* @return the type of this widget
-		*/
-		get type():string;
-	}
-
-
-	/**
-	* Provides access to data in a table. Note that several methods present their response through Promises. This allows
-	* the client to both avoid actually connecting to the server until necessary, and also will permit some changes not to
-	* inform the UI right away that they have taken place.
-	*/
-	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;
-
-		protected constructor();
-
-		batch(userCode:(arg0:unknown)=>void):Promise<Table>;
-		/**
-		* Retrieve a column by the given name. You should prefer to always retrieve a new Column instance instead of
-		* caching a returned value.
-		* @param key - 
-		* @return {@link dh.Column}
-		*/
-		findColumn(key:string):Column;
-		/**
-		* Retrieve multiple columns specified by the given names.
-		* @param keys - 
-		* @return {@link dh.Column} array
-		*/
-		findColumns(keys:string[]):Column[];
-		isBlinkTable():boolean;
-		/**
-		* If .hasInputTable is true, you may call this method to gain access to an InputTable object which can be used to
-		* mutate the data within the table. If the table is not an Input Table, the promise will be immediately rejected.
-		* @return Promise of dh.InputTable
-		*/
-		inputTable():Promise<InputTable>;
-		/**
-		* Indicates that this Table instance will no longer be used, and its connection to the server can be cleaned up.
+		* Indicates that this Table instance will no longer be used, and its connection to the server can be cleaned up.
 		*/
 		close():void;
 		getAttributes():string[];
@@ -1490,84 +1070,318 @@ export namespace dh {
 		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.
+	* Represents a set of Tables each corresponding to some key. The keys are available locally, but a call must be made to
+	* the server to get each Table. All tables will have the same structure.
 	*/
-	export class Sort {
-		static readonly ASCENDING:string;
-		static readonly DESCENDING:string;
-		static readonly REVERSE:string;
+	export class PartitionedTable implements HasEventHandling {
+		/**
+		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
+		*/
+		static readonly EVENT_KEYADDED:string;
+		/**
+		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
+		*/
+		static readonly EVENT_DISCONNECT:string;
+		/**
+		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
+		*/
+		static readonly EVENT_RECONNECT:string;
+		/**
+		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
+		*/
+		static readonly EVENT_RECONNECTFAILED:string;
 
 		protected constructor();
 
+		typedTicket():dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
 		/**
-		* Builds a Sort instance to sort values in ascending order.
-		* @return {@link dh.Sort}
+		* Fetch the table with the given key. If the key does not exist, returns `null`.
+		* @param key - The key to fetch. An array of values for each key column, in the same order as the key columns are.
+		* @return Promise of dh.Table, or `null` if the key does not exist.
 		*/
-		asc():Sort;
+		getTable(key:object):Promise<Table|undefined|null>;
 		/**
-		* Builds a Sort instance to sort values in descending order.
-		* @return {@link dh.Sort}
+		* Open a new table that is the result of merging all constituent tables. See
+		* {@link io.deephaven.engine.table.PartitionedTable#merge()} for details.
+		* @return A merged representation of the constituent tables.
 		*/
-		desc():Sort;
+		getMergedTable():Promise<Table>;
 		/**
-		* Builds a Sort instance which takes the absolute value before applying order.
-		* @return {@link dh.Sort}
+		* The set of all currently known keys. This is kept up to date, so getting the list after adding an event listener
+		* for <b>keyadded</b> will ensure no keys are missed.
+		* @return Set of Object
 		*/
-		abs():Sort;
-		toString():string;
+		getKeys():Set<object>;
 		/**
-		* True if the absolute value of the column should be used when sorting; defaults to false.
-		* @return boolean
+		* Fetch a table containing all the valid keys of the partitioned table.
+		* @return Promise of a Table
+		* @deprecated
 		*/
-		get isAbs():boolean;
+		getKeyTable():Promise<Table>;
 		/**
-		* The column which is sorted.
-		* @return {@link dh.Column}
+		* Fetch the underlying base table of the partitioned table.
+		* @return Promise of a Table
 		*/
-		get column():Column;
+		getBaseTable():Promise<Table>;
 		/**
-		* The direction of this sort, either <b>ASC</b>, <b>DESC</b>, or <b>REVERSE</b>.
-		* @return String
+		* Indicates that this PartitionedTable will no longer be used, removing subcriptions to updated keys, etc. This
+		* will not affect tables in use.
 		*/
-		get direction():string;
+		close():void;
+		/**
+		* The count of known keys.
+		* @return int
+		*/
+		get size():number;
+		/**
+		* An array of the columns in the tables that can be retrieved from this partitioned table, including both key and
+		* non-key columns.
+		* @return Array of Column
+		*/
+		get columns():Column[];
+		/**
+		* An array of all the key columns that the tables are partitioned by.
+		* @return Array of Column
+		*/
+		get keyColumns():Column[];
+		/**
+		* 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;
+		/**
+		* 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 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.
+	* Wrap BigDecimal values for use in JS. Provides text formatting for display and access to the underlying value.
 	*/
-	export class FilterCondition {
+	export class BigDecimalWrapper {
 		protected constructor();
 
+		static ofString(value:string):BigDecimalWrapper;
+		asNumber():number;
+		valueOf():string;
+		toString():string;
+	}
+
+	/**
+	* Presently, this is the entrypoint into the Deephaven JS API. By creating an instance of this with the server URL and
+	* some options, JS applications can run code on the server, and interact with available exportable objects.
+	*/
+	export class IdeConnection implements HasEventHandling {
 		/**
-		* the opposite of this condition
-		* @return FilterCondition
+		* @deprecated
 		*/
-		not():FilterCondition;
+		static readonly HACK_CONNECTION_FAILURE:string;
+		static readonly EVENT_DISCONNECT:string;
+		static readonly EVENT_RECONNECT:string;
+		static readonly EVENT_SHUTDOWN:string;
+
 		/**
-		* a condition representing the current condition logically ANDed with the other parameters
-		* @param filters - 
-		* @return FilterCondition
+		* 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
 		*/
-		and(...filters:FilterCondition[]):FilterCondition;
+		constructor(serverUrl:string, connectOptions?:ConnectOptions, fromJava?:boolean);
+
 		/**
-		* a condition representing the current condition logically ORed with the other parameters
-		* @param filters - 
-		* @return FilterCondition.
+		* closes the current connection, releasing any resources on the server or client.
 		*/
-		or(...filters:FilterCondition[]):FilterCondition;
+		close():void;
+		running():Promise<IdeConnection>;
+		getObject(definitionObject:dh.ide.VariableDescriptor):Promise<any>;
+		subscribeToFieldUpdates(callback:(arg0:dh.ide.VariableChanges)=>void):()=>void;
 		/**
-		* a string suitable for debugging showing the details of this condition.
-		* @return String.
+		* 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}
 		*/
-		toString():string;
-		get columns():Array<Column>;
-		/**
-		* a filter condition invoking a static function with the given parameters. Currently supported Deephaven static
+		onLogMessage(callback:(arg0:dh.ide.LogItem)=>void):()=>void;
+		startSession(type:string):Promise<IdeSession>;
+		getConsoleTypes():Promise<Array<string>>;
+		getWorkerHeapInfo():Promise<WorkerHeapInfo>;
+		/**
+		* 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;
+		/**
+		* 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;
+	}
+
+	export class IdeSession implements HasEventHandling {
+		static readonly EVENT_COMMANDSTARTED:string;
+		static readonly EVENT_REQUEST_FAILED:string;
+
+		protected constructor();
+
+		/**
+		* Load the named table, with columns and size information already fully populated.
+		* @param name - 
+		* @param applyPreviewColumns - optional boolean
+		* @return {@link Promise} of {@link dh.Table}
+		*/
+		getTable(name:string, applyPreviewColumns?:boolean):Promise<Table>;
+		/**
+		* Load the named Figure, including its tables and tablemaps as needed.
+		* @param name - 
+		* @return promise of dh.plot.Figure
+		*/
+		getFigure(name:string):Promise<dh.plot.Figure>;
+		/**
+		* Loads the named tree table or roll-up table, with column data populated. All nodes are collapsed by default, and
+		* size is presently not available until the viewport is first set.
+		* @param name - 
+		* @return {@link Promise} of {@link dh.TreeTable}
+		*/
+		getTreeTable(name:string):Promise<TreeTable>;
+		getHierarchicalTable(name:string):Promise<TreeTable>;
+		getPartitionedTable(name:string):Promise<PartitionedTable>;
+		getObject(definitionObject:dh.ide.VariableDescriptor):Promise<any>;
+		newTable(columnNames:string[], types:string[], data:string[][], userTimeZone:string):Promise<Table>;
+		/**
+		* Merges the given tables into a single table. Assumes all tables have the same structure.
+		* @param tables - 
+		* @return {@link Promise} of {@link dh.Table}
+		*/
+		mergeTables(tables:Table[]):Promise<Table>;
+		bindTableToVariable(table:Table, name:string):Promise<void>;
+		subscribeToFieldUpdates(callback:(arg0:dh.ide.VariableChanges)=>void):()=>void;
+		close():void;
+		runCode(code:string):Promise<dh.ide.CommandResult>;
+		onLogMessage(callback:(arg0:dh.ide.LogItem)=>void):()=>void;
+		openDocument(params:object):void;
+		changeDocument(params:object):void;
+		getCompletionItems(params:object):Promise<Array<dh.lsp.CompletionItem>>;
+		getSignatureHelp(params:object):Promise<Array<dh.lsp.SignatureInformation>>;
+		getHover(params:object):Promise<dh.lsp.Hover>;
+		closeDocument(params:object):void;
+		/**
+		* Creates an empty table with the specified number of rows. Optionally columns and types may be specified, but all
+		* values will be null.
+		* @param size - 
+		* @return {@link Promise} of {@link dh.Table}
+		*/
+		emptyTable(size:number):Promise<Table>;
+		/**
+		* Creates a new table that ticks automatically every "periodNanos" nanoseconds. A start time may be provided; if so
+		* the table will be populated with the interval from the specified date until now.
+		* @param periodNanos - 
+		* @param startTime - 
+		* @return {@link Promise} of {@link dh.Table}
+		*/
+		timeTable(periodNanos:number, startTime?:DateWrapper):Promise<Table>;
+		addEventListener<T>(name:string, callback:(e: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 QueryInfo {
+		static readonly EVENT_TABLE_OPENED:string;
+		static readonly EVENT_DISCONNECT:string;
+		static readonly EVENT_RECONNECT:string;
+		static readonly EVENT_CONNECT:string;
+
+		protected constructor();
+	}
+
+	/**
+	* 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
+		*/
+		idColumn:string;
+		/**
+		* The column representing the parent ID for each item
+		*/
+		parentColumn:string;
+		/**
+		* Optional parameter indicating if items with an invalid parent ID should be promoted to root. Defaults to false.
+		*/
+		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();
+	}
+
+	/**
+	* Describes a filter which can be applied to a table. Replacing these instances may be more expensive than reusing
+	* them. These instances are immutable - all operations that compose them to build bigger expressions return a new
+	* instance.
+	*/
+	export class FilterCondition {
+		protected constructor();
+
+		/**
+		* the opposite of this condition
+		* @return FilterCondition
+		*/
+		not():FilterCondition;
+		/**
+		* a condition representing the current condition logically ANDed with the other parameters
+		* @param filters - 
+		* @return FilterCondition
+		*/
+		and(...filters:FilterCondition[]):FilterCondition;
+		/**
+		* a condition representing the current condition logically ORed with the other parameters
+		* @param filters - 
+		* @return FilterCondition.
+		*/
+		or(...filters:FilterCondition[]):FilterCondition;
+		/**
+		* a string suitable for debugging showing the details of this condition.
+		* @return 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
@@ -1609,175 +1423,39 @@ export namespace dh {
 	}
 
 	/**
-	* Describes data that can be filtered, either a column reference or a literal value. Used this way, the type of a value
-	* can be specified so that values which are ambiguous or not well supported in JS will not be confused with Strings or
-	* imprecise numbers (e.g., nanosecond-precision date values). Additionally, once wrapped in this way, methods can be
-	* called on these value literal instances. These instances are immutable - any method called on them returns a new
-	* instance.
+	* 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 FilterValue {
+	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;
 		/**
-		* Constructs a number for the filter API from the given parameter. Can also be used on the values returned from
-		* {@link TableData.get} for DateTime values. To create
-		* a filter with a date, use <b>dh.DateWrapper.ofJsDate</b> or
-		* {@link i18n.DateTimeFormat.parse}. To create a filter with a
-		* 64-bit long integer, use {@link LongWrapper.ofString}.
-		* @param input - the number to wrap as a FilterValue
-		* @return an immutable FilterValue that can be built into a filter
-		*/
-		static ofNumber(input:LongWrapper|number):FilterValue;
-		/**
-		* a filter condition checking if the current value is equal to the given parameter
-		* @param term - 
-		* @return {@link dh.FilterCondition}
-		*/
-		eq(term:FilterValue):FilterCondition;
-		/**
-		* a filter condition checking if the current value is equal to the given parameter, ignoring differences of upper
-		* vs lower case
-		* @param term - 
-		* @return {@link dh.FilterCondition}
-		*/
-		eqIgnoreCase(term:FilterValue):FilterCondition;
-		/**
-		* a filter condition checking if the current value is not equal to the given parameter
-		* @param term - 
-		* @return {@link dh.FilterCondition}
-		*/
-		notEq(term:FilterValue):FilterCondition;
-		/**
-		* a filter condition checking if the current value is not equal to the given parameter, ignoring differences of
-		* upper vs lower case
-		* @param term - 
-		* @return {@link dh.FilterCondition}
-		*/
-		notEqIgnoreCase(term:FilterValue):FilterCondition;
-		/**
-		* a filter condition checking if the current value is greater than the given parameter
-		* @param term - 
-		* @return {@link dh.FilterCondition}
-		*/
-		greaterThan(term:FilterValue):FilterCondition;
-		/**
-		* a filter condition checking if the current value is less than the given parameter
-		* @param term - 
-		* @return {@link dh.FilterCondition}
-		*/
-		lessThan(term:FilterValue):FilterCondition;
-		/**
-		* a filter condition checking if the current value is greater than or equal to the given parameter
-		* @param term - 
-		* @return {@link dh.FilterCondition}
-		*/
-		greaterThanOrEqualTo(term:FilterValue):FilterCondition;
-		/**
-		* a filter condition checking if the current value is less than or equal to the given parameter
-		* @param term - 
-		* @return {@link dh.FilterCondition}
+		* a new iterator over all indexes in this collection.
+		* @return Iterator of {@link dh.LongWrapper}
 		*/
-		lessThanOrEqualTo(term:FilterValue):FilterCondition;
+		iterator():Iterator<LongWrapper>;
 		/**
-		* a filter condition checking if the current value is in the given set of values
-		* @param terms - 
-		* @return {@link dh.FilterCondition}
+		* 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
 		*/
-		in(terms:FilterValue[]):FilterCondition;
-		/**
-		* a filter condition checking if the current value is in the given set of values, ignoring differences of upper vs
-		* lower case
-		* @param terms - 
-		* @return {@link dh.FilterCondition}
-		*/
-		inIgnoreCase(terms:FilterValue[]):FilterCondition;
-		/**
-		* a filter condition checking that the current value is not in the given set of values
-		* @param terms - 
-		* @return {@link dh.FilterCondition}
-		*/
-		notIn(terms:FilterValue[]):FilterCondition;
-		/**
-		* a filter condition checking that the current value is not in the given set of values, ignoring differences of
-		* upper vs lower case
-		* @param terms - 
-		* @return {@link dh.FilterCondition}
-		*/
-		notInIgnoreCase(terms:FilterValue[]):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;
+		get size():number;
+	}
+
+	/**
+	* Event fired when a command is issued from the client.
+	*/
+	export class CommandInfo {
+		constructor(code:string, result:Promise<dh.ide.CommandResult>);
+
+		get result():Promise<dh.ide.CommandResult>;
+		get code():string;
 	}
 
 	/**
@@ -1795,82 +1473,304 @@ export namespace dh {
 	}
 
 	/**
-	* Describes the structure of the column, and if desired can be used to get access to the data to be rendered in this
-	* column.
+	* A Widget represents a server side object that sends one or more responses to the client. The client can then
+	* interpret these responses to see what to render, or how to respond.
+	* <p>
+	* Most custom object types result in a single response being sent to the client, often with other exported objects, but
+	* some will have streamed responses, and allow the client to send follow-up requests of its own. This class's API is
+	* backwards compatible, but as such does not offer a way to tell the difference between a streaming or non-streaming
+	* object type, the client code that handles the payloads is expected to know what to expect. See
+	* {@link dh.WidgetMessageDetails} for more information.
+	* <p>
+	* When the promise that returns this object resolves, it will have the first response assigned to its fields. Later
+	* responses from the server will be emitted as "message" events. When the connection with the server ends, the "close"
+	* event will be emitted. In this way, the connection will behave roughly in the same way as a WebSocket - either side
+	* can close, and after close no more messages will be processed. There can be some latency in closing locally while
+	* remote messages are still pending - it is up to implementations of plugins to handle this case.
+	* <p>
+	* Also like WebSockets, the plugin API doesn't define how to serialize messages, and just handles any binary payloads.
+	* What it does handle however, is allowing those messages to include references to server-side objects with those
+	* payloads. Those server side objects might be tables or other built-in types in the Deephaven JS API, or could be
+	* objects usable through their own plugins. They also might have no plugin at all, allowing the client to hold a
+	* reference to them and pass them back to the server, either to the current plugin instance, or through another API.
+	* The `Widget` type does not specify how those objects should be used or their lifecycle, but leaves that
+	* entirely to the plugin. Messages will arrive in the order they were sent.
+	* <p>
+	* This can suggest several patterns for how plugins operate:
+	* <ul>
+	* <li>The plugin merely exists to transport some other object to the client. This can be useful for objects which can
+	* easily be translated to some other type (like a Table) when the user clicks on it. An example of this is
+	* `pandas.DataFrame` will result in a widget that only contains a static
+	* {@link dh.Table}. Presently, the widget is immediately closed, and only the Table is
+	* provided to the JS API consumer.</li>
+	* <li>The plugin provides references to Tables and other objects, and those objects can live longer than the object
+	* which provided them. One concrete example of this could have been
+	* {@link dh.PartitionedTable} when fetching constituent tables, but it was implemented
+	* before bidirectional plugins were implemented. Another example of this is plugins that serve as a "factory", giving
+	* the user access to table manipulation/creation methods not supported by gRPC or the JS API.</li>
+	* <li>The plugin provides reference to Tables and other objects that only make sense within the context of the widget
+	* instance, so when the widget goes away, those objects should be released as well. This is also an example of
+	* {@link dh.PartitionedTable}, as the partitioned table tracks creation of new keys through
+	* an internal table instance.</li>
+	* </ul>
+	*
+	* Handling server objects in messages also has more than one potential pattern that can be used:
+	* <ul>
+	* <li>One object per message - the message clearly is about that object, no other details required.</li>
+	* <li>Objects indexed within their message - as each message comes with a list of objects, those objects can be
+	* referenced within the payload by index. This is roughly how {@link dh.plot.Figure}
+	* behaves, where the figure descriptor schema includes an index for each created series, describing which table should
+	* be used, which columns should be mapped to each axis.</li>
+	* <li>Objects indexed since widget creation - each message would append its objects to a list created when the widget
+	* was first made, and any new exports that arrive in a new message would be appended to that list. Then, subsequent
+	* messages can reference objects already sent. This imposes a limitation where the client cannot release any exports
+	* without the server somehow signaling that it will never reference that export again.</li>
+	* </ul>
 	*/
-	export class 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;
+	export class Widget implements WidgetMessageDetails, HasEventHandling {
+		static readonly EVENT_MESSAGE:string;
+		static readonly EVENT_CLOSE:string;
 
 		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
+		* Ends the client connection to the server.
 		*/
-		get(row:Row):any;
-		getFormat(row:Row):Format;
+		close():void;
+		getDataAsBase64():string;
+		getDataAsU8():Uint8Array;
+		getDataAsString():string;
 		/**
-		* Creates a sort builder object, to be used when sorting by this column.
-		* @return {@link dh.Sort}
+		* Sends a string/bytes payload to the server, along with references to objects that exist on the server.
+		* @param msg - string/buffer/view instance that represents data to send
+		* @param references - an array of objects that can be safely sent to the server
 		*/
-		sort():Sort;
+		sendMessage(msg:string|ArrayBuffer|ArrayBufferView, references?:Array<Table|Widget|WidgetExportedObject|PartitionedTable|TotalsTable|TreeTable>):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;
 		/**
-		* 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}
+		* 
+		* @return the exported objects sent in the initial message from the server. The client is responsible for closing
+		*         them when finished using them.
 		*/
-		filter():FilterValue;
+		get exportedObjects():WidgetExportedObject[];
 		/**
-		* a <b>CustomColumn</b> object to apply using `applyCustomColumns` with the expression specified.
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* 
+		* @return the type of this widget
 		*/
-		formatColor(expression:string):CustomColumn;
+		get type():string;
+	}
+
+	/**
+	* 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();
+
 		/**
-		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* Builds a Sort instance to sort values in ascending order.
+		* @return {@link dh.Sort}
 		*/
-		formatNumber(expression:string):CustomColumn;
+		asc():Sort;
 		/**
-		* a <b>CustomColumn</b> object to apply using <b>applyCustomColumns</b> with the expression specified.
-		* @param expression - 
-		* @return {@link dh.CustomColumn}
+		* Builds a Sort instance to sort values in descending order.
+		* @return {@link dh.Sort}
 		*/
-		formatDate(expression:string):CustomColumn;
-		toString():string;
+		desc():Sort;
 		/**
-		* Label for this column.
-		* @return String
+		* Builds a Sort instance which takes the absolute value before applying order.
+		* @return {@link dh.Sort}
 		*/
-		get name():string;
+		abs():Sort;
+		toString():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>)
+		* True if the absolute value of the column should be used when sorting; defaults to false.
 		* @return boolean
 		*/
-		get isPartitionColumn():boolean;
+		get isAbs():boolean;
 		/**
-		* 
-		* @deprecated do not use. Internal index of the column in the table, to be used as a key on the Row.
-		* @return int
+		* The column which is sorted.
+		* @return {@link dh.Column}
 		*/
-		get index():number;
-		get isSortable():boolean;
+		get column():Column;
 		/**
-		* Type of the row data that can be found in this column.
+		* The direction of this sort, either <b>ASC</b>, <b>DESC</b>, or <b>REVERSE</b>.
 		* @return String
 		*/
-		get type():string;
-		/**
-		* Format entire rows colors using the expression specified. Returns a <b>CustomColumn</b> object to apply to a
+		get direction():string;
+	}
+
+	export class CustomColumn {
+		static readonly TYPE_FORMAT_COLOR:string;
+		static readonly TYPE_FORMAT_NUMBER:string;
+		static readonly TYPE_FORMAT_DATE:string;
+		static readonly TYPE_NEW:string;
+
+		protected constructor();
+
+		valueOf():string;
+		toString():string;
+		/**
+		* The expression to evaluate this custom column.
+		* @return String
+		*/
+		get expression():string;
+		/**
+		* The name of the column to use.
+		* @return String
+		*/
+		get name():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
+		*/
+		get type():string;
+	}
+
+	export class LongWrapper {
+		protected constructor();
+
+		static ofString(str:string):LongWrapper;
+		asNumber():number;
+		valueOf():string;
+		toString():string;
+	}
+
+	export class Ide {
+		constructor();
+
+		/**
+		* @deprecated
+		*/
+		getExistingSession(websocketUrl:string, authToken:string, serviceId:string, language:string):Promise<IdeSession>;
+		/**
+		* @deprecated
+		*/
+		static getExistingSession(websocketUrl:string, authToken:string, serviceId:string, language:string):Promise<IdeSession>;
+	}
+
+	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;
+	}
+
+	/**
+	* 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}
@@ -1885,6 +1785,36 @@ export namespace dh {
 		static createCustomColumn(name:string, expression:string):CustomColumn;
 	}
 
+	/**
+	* 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 {
+		/**
+		* 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;
+
+		constructor();
+	}
+
 	/**
 	* Behaves like a {@link dh.Table} externally, but data, state, and viewports are managed by an entirely different
 	* mechanism, and so reimplemented here.
@@ -2100,254 +2030,330 @@ export namespace dh {
 	}
 
 	/**
-	* Represents a set of Tables each corresponding to some key. The keys are available locally, but a call must be made to
-	* the server to get each Table. All tables will have the same structure.
+	* Wrap BigInteger values for use in JS. Provides text formatting for display and access to the underlying value.
 	*/
-	export class PartitionedTable implements HasEventHandling {
-		/**
-		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
-		*/
-		static readonly EVENT_KEYADDED:string;
-		/**
-		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
-		*/
-		static readonly EVENT_DISCONNECT:string;
-		/**
-		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
-		*/
-		static readonly EVENT_RECONNECT:string;
+	export class BigIntegerWrapper {
+		protected constructor();
+
+		static ofString(str:string):BigIntegerWrapper;
+		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 {
 		/**
-		* Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
+		* 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.
 		*/
-		static readonly EVENT_RECONNECTFAILED:string;
+		static readonly EVENT_UPDATED:string;
 
 		protected constructor();
 
-		typedTicket():dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
 		/**
-		* Fetch the table with the given key. If the key does not exist, returns `null`.
-		* @param key - The key to fetch. An array of values for each key column, in the same order as the key columns are.
-		* @return Promise of dh.Table, or `null` if the key does not exist.
+		* Stops the subscription on the server.
 		*/
-		getTable(key:object):Promise<Table|undefined|null>;
+		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;
 		/**
-		* Open a new table that is the result of merging all constituent tables. See
-		* {@link io.deephaven.engine.table.PartitionedTable#merge()} for details.
-		* @return A merged representation of the constituent tables.
+		* The columns that were subscribed to when this subscription was created
+		* @return {@link dh.Column}
 		*/
-		getMergedTable():Promise<Table>;
+		get columns():Array<Column>;
+	}
+
+	/**
+	* Deprecated for use in Deephaven Core.
+	* @deprecated
+	*/
+	export class Client {
+		static readonly EVENT_REQUEST_FAILED:string;
+		static readonly EVENT_REQUEST_STARTED:string;
+		static readonly EVENT_REQUEST_SUCCEEDED:string;
+
+		constructor();
+	}
+
+	/**
+	* Describes data that can be filtered, either a column reference or a literal value. Used this way, the type of a value
+	* can be specified so that values which are ambiguous or not well supported in JS will not be confused with Strings or
+	* imprecise numbers (e.g., nanosecond-precision date values). Additionally, once wrapped in this way, methods can be
+	* called on these value literal instances. These instances are immutable - any method called on them returns a new
+	* instance.
+	*/
+	export class FilterValue {
+		protected constructor();
+
 		/**
-		* The set of all currently known keys. This is kept up to date, so getting the list after adding an event listener
-		* for <b>keyadded</b> will ensure no keys are missed.
-		* @return Set of Object
+		* Constructs a number for the filter API from the given parameter. Can also be used on the values returned from
+		* {@link TableData.get} for DateTime values. To create
+		* a filter with a date, use <b>dh.DateWrapper.ofJsDate</b> or
+		* {@link i18n.DateTimeFormat.parse}. To create a filter with a
+		* 64-bit long integer, use {@link LongWrapper.ofString}.
+		* @param input - the number to wrap as a FilterValue
+		* @return an immutable FilterValue that can be built into a filter
 		*/
-		getKeys():Set<object>;
+		static ofNumber(input:LongWrapper|number):FilterValue;
 		/**
-		* Fetch a table containing all the valid keys of the partitioned table.
-		* @return Promise of a Table
+		* a filter condition checking if the current value is equal to the given parameter
+		* @param term - 
+		* @return {@link dh.FilterCondition}
 		*/
-		getKeyTable():Promise<Table>;
+		eq(term:FilterValue):FilterCondition;
 		/**
-		* Indicates that this PartitionedTable will no longer be used, removing subcriptions to updated keys, etc. This
-		* will not affect tables in use.
+		* a filter condition checking if the current value is equal to the given parameter, ignoring differences of upper
+		* vs lower case
+		* @param term - 
+		* @return {@link dh.FilterCondition}
 		*/
-		close():void;
+		eqIgnoreCase(term:FilterValue):FilterCondition;
 		/**
-		* The count of known keys.
-		* @return int
+		* a filter condition checking if the current value is not equal to the given parameter
+		* @param term - 
+		* @return {@link dh.FilterCondition}
 		*/
-		get size():number;
+		notEq(term:FilterValue):FilterCondition;
 		/**
-		* An array of the columns in the tables that can be retrieved from this partitioned table, including both key and
-		* non-key columns.
-		* @return Array of Column
+		* a filter condition checking if the current value is not equal to the given parameter, ignoring differences of
+		* upper vs lower case
+		* @param term - 
+		* @return {@link dh.FilterCondition}
 		*/
-		get columns():Column[];
+		notEqIgnoreCase(term:FilterValue):FilterCondition;
 		/**
-		* An array of all the key columns that the tables are partitioned by.
-		* @return Array of Column
+		* a filter condition checking if the current value is greater than the given parameter
+		* @param term - 
+		* @return {@link dh.FilterCondition}
 		*/
-		get keyColumns():Column[];
+		greaterThan(term:FilterValue):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
+		* a filter condition checking if the current value is less than the given parameter
+		* @param term - 
+		* @return {@link dh.FilterCondition}
 		*/
-		addEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
-		hasListeners(name:string):boolean;
+		lessThan(term:FilterValue):FilterCondition;
 		/**
-		* Removes an event listener added to this table.
-		* @param name - 
-		* @param callback - 
-		* @return 
-		* @typeParam T - 
+		* a filter condition checking if the current value is greater than or equal to the given parameter
+		* @param term - 
+		* @return {@link dh.FilterCondition}
 		*/
-		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
-	}
-
-	export class IdeSession implements HasEventHandling {
-		static readonly EVENT_COMMANDSTARTED:string;
-		static readonly EVENT_REQUEST_FAILED:string;
-
-		protected constructor();
-
+		greaterThanOrEqualTo(term:FilterValue):FilterCondition;
 		/**
-		* Load the named table, with columns and size information already fully populated.
-		* @param name - 
-		* @param applyPreviewColumns - optional boolean
-		* @return {@link Promise} of {@link dh.Table}
+		* a filter condition checking if the current value is less than or equal to the given parameter
+		* @param term - 
+		* @return {@link dh.FilterCondition}
 		*/
-		getTable(name:string, applyPreviewColumns?:boolean):Promise<Table>;
+		lessThanOrEqualTo(term:FilterValue):FilterCondition;
 		/**
-		* Load the named Figure, including its tables and tablemaps as needed.
-		* @param name - 
-		* @return promise of dh.plot.Figure
+		* a filter condition checking if the current value is in the given set of values
+		* @param terms - 
+		* @return {@link dh.FilterCondition}
 		*/
-		getFigure(name:string):Promise<dh.plot.Figure>;
+		in(terms:FilterValue[]):FilterCondition;
 		/**
-		* Loads the named tree table or roll-up table, with column data populated. All nodes are collapsed by default, and
-		* size is presently not available until the viewport is first set.
-		* @param name - 
-		* @return {@link Promise} of {@link dh.TreeTable}
+		* a filter condition checking if the current value is in the given set of values, ignoring differences of upper vs
+		* lower case
+		* @param terms - 
+		* @return {@link dh.FilterCondition}
 		*/
-		getTreeTable(name:string):Promise<TreeTable>;
-		getHierarchicalTable(name:string):Promise<TreeTable>;
-		getPartitionedTable(name:string):Promise<PartitionedTable>;
-		getObject(definitionObject:dh.ide.VariableDescriptor):Promise<any>;
-		newTable(columnNames:string[], types:string[], data:string[][], userTimeZone:string):Promise<Table>;
+		inIgnoreCase(terms:FilterValue[]):FilterCondition;
 		/**
-		* Merges the given tables into a single table. Assumes all tables have the same structure.
-		* @param tables - 
-		* @return {@link Promise} of {@link dh.Table}
+		* a filter condition checking that the current value is not in the given set of values
+		* @param terms - 
+		* @return {@link dh.FilterCondition}
 		*/
-		mergeTables(tables:Table[]):Promise<Table>;
-		bindTableToVariable(table:Table, name:string):Promise<void>;
-		subscribeToFieldUpdates(callback:(arg0:dh.ide.VariableChanges)=>void):()=>void;
-		close():void;
-		runCode(code:string):Promise<dh.ide.CommandResult>;
-		onLogMessage(callback:(arg0:dh.ide.LogItem)=>void):()=>void;
-		openDocument(params:object):void;
-		changeDocument(params:object):void;
-		getCompletionItems(params:object):Promise<Array<dh.lsp.CompletionItem>>;
-		getSignatureHelp(params:object):Promise<Array<dh.lsp.SignatureInformation>>;
-		getHover(params:object):Promise<dh.lsp.Hover>;
-		closeDocument(params:object):void;
+		notIn(terms:FilterValue[]):FilterCondition;
 		/**
-		* Creates an empty table with the specified number of rows. Optionally columns and types may be specified, but all
-		* values will be null.
-		* @param size - 
-		* @return {@link Promise} of {@link dh.Table}
+		* a filter condition checking that the current value is not in the given set of values, ignoring differences of
+		* upper vs lower case
+		* @param terms - 
+		* @return {@link dh.FilterCondition}
 		*/
-		emptyTable(size:number):Promise<Table>;
+		notInIgnoreCase(terms:FilterValue[]):FilterCondition;
 		/**
-		* Creates a new table that ticks automatically every "periodNanos" nanoseconds. A start time may be provided; if so
-		* the table will be populated with the interval from the specified date until now.
-		* @param periodNanos - 
-		* @param startTime - 
-		* @return {@link Promise} of {@link dh.Table}
+		* a filter condition checking if the given value contains the given string value
+		* @param term - 
+		* @return {@link dh.FilterCondition}
 		*/
-		timeTable(periodNanos:number, startTime?:DateWrapper):Promise<Table>;
-		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;
+		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.
+	* 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 RangeSet {
+	export class InputTable {
 		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}
+		* 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
 		*/
-		iterator():Iterator<LongWrapper>;
+		addRow(row:{ [key: string]: any; }, userTimeZone?:string):Promise<InputTable>;
 		/**
-		* 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
+		* Add multiple rows to a table.
+		* @param rows - 
+		* @param userTimeZone - 
+		* @return Promise of dh.InputTable
 		*/
-		get size():number;
-	}
-
-	export class LoginCredentials {
-		type?:string|null;
-		username?:string|null;
-		token?:string|null;
-
-		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 {
+		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
+		*/
+		addTable(tableToAdd:Table):Promise<InputTable>;
+		/**
+		* Add multiple tables to this Input Table.
+		* @param tablesToAdd - 
+		* @return Promise of dh.InputTable
+		*/
+		addTables(tablesToAdd:Table[]):Promise<InputTable>;
+		/**
+		* Deletes an entire table from this Input Table. Key columns must match the Input Table.
+		* @param tableToDelete - 
+		* @return Promise of dh.InputTable
+		*/
+		deleteTable(tableToDelete:Table):Promise<InputTable>;
+		/**
+		* Delete multiple tables from this Input Table.
+		* @param tablesToDelete - 
+		* @return 
 		*/
-		static readonly HACK_CONNECTION_FAILURE:string;
-		static readonly EVENT_DISCONNECT:string;
-		static readonly EVENT_RECONNECT:string;
-		static readonly EVENT_SHUTDOWN:string;
-
+		deleteTables(tablesToDelete:Table[]):Promise<InputTable>;
 		/**
-		* 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
+		* A list of the key columns, by name
+		* @return String array.
 		*/
-		constructor(serverUrl:string, connectOptions?:ConnectOptions, fromJava?:boolean);
-
+		get keys():string[];
 		/**
-		* closes the current connection, releasing any resources on the server or client.
+		* A list of the value columns, by name
+		* @return String array.
 		*/
-		close():void;
-		running():Promise<IdeConnection>;
-		getObject(definitionObject:dh.ide.VariableDescriptor):Promise<any>;
-		subscribeToFieldUpdates(callback:(arg0:dh.ide.VariableChanges)=>void):()=>void;
+		get values():string[];
 		/**
-		* 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}
+		* A list of the key columns.
+		* @return Column array.
 		*/
-		onLogMessage(callback:(arg0:dh.ide.LogItem)=>void):()=>void;
-		startSession(type:string):Promise<IdeSession>;
-		getConsoleTypes():Promise<Array<string>>;
-		getWorkerHeapInfo():Promise<WorkerHeapInfo>;
+		get keyColumns():Column[];
 		/**
-		* 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
+		* A list of the value Column objects
+		* @return {@link dh.Column} array.
 		*/
-		addEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):()=>void;
-		nextEvent<T>(eventName:string, timeoutInMillis?:number):Promise<CustomEvent<T>>;
-		hasListeners(name:string):boolean;
+		get valueColumns():Column[];
 		/**
-		* Removes an event listener added to this table.
-		* @param name - 
-		* @param callback - 
-		* @return 
-		* @typeParam T - 
+		* The source table for this Input Table
+		* @return dh.table
 		*/
-		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
+		get table():Table;
+	}
+
+	export class DateWrapper extends LongWrapper {
+		protected constructor();
+
+		static ofJsDate(date:Date):DateWrapper;
+		asDate():Date;
 	}
 
 
@@ -2372,23 +2378,6 @@ export namespace dh {
 		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;
-	}
-
-	type SearchDisplayModeType = string;
-	export class SearchDisplayMode {
-		static readonly SEARCH_DISPLAY_DEFAULT:SearchDisplayModeType;
-		static readonly SEARCH_DISPLAY_HIDE:SearchDisplayModeType;
-		static readonly SEARCH_DISPLAY_SHOW:SearchDisplayModeType;
-	}
-
 	/**
 	* A set of string constants that can be used to describe the different objects the JS API can export.
 	*/
@@ -2405,10 +2394,42 @@ export namespace dh {
 		static readonly TREEMAP:VariableTypeType;
 	}
 
+	type SearchDisplayModeType = string;
+	export class SearchDisplayMode {
+		static readonly SEARCH_DISPLAY_DEFAULT:SearchDisplayModeType;
+		static readonly SEARCH_DISPLAY_HIDE:SearchDisplayModeType;
+		static readonly SEARCH_DISPLAY_SHOW:SearchDisplayModeType;
+	}
+
+	type ValueTypeType = string;
+	export class ValueType {
+		static readonly STRING:ValueTypeType;
+		static readonly NUMBER:ValueTypeType;
+		static readonly DOUBLE:ValueTypeType;
+		static readonly LONG:ValueTypeType;
+		static readonly DATETIME:ValueTypeType;
+		static readonly BOOLEAN:ValueTypeType;
+	}
+
 }
 
 export namespace dh.ide {
 
+	/**
+	* 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;
+	}
 	/**
 	* Specifies a type and either id or name (but not both).
 	*/
@@ -2503,79 +2524,10 @@ export namespace dh.ide {
 		*/
 		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.
@@ -2674,6 +2626,60 @@ export namespace dh.i18n {
 		toString():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;
+	}
+
+
 	/**
 	* Represents the timezones supported by Deephaven. Can be used to format dates, taking into account the offset changing
 	* throughout the year (potentially changing each year). These instances mostly are useful at this time to pass to the
@@ -2784,11 +2790,26 @@ export namespace dh.i18n {
 		*/
 		get id():string;
 	}
-
-}
-
-export namespace dh.plot {
-
+
+}
+
+export namespace dh.plot {
+
+	/**
+	* Describes a template that will be used to make new series instances when a new table added to a plotBy.
+	*/
+	export interface MultiSeries {
+		/**
+		* The name for this multi-series.
+		* @return String
+		*/
+		get name():string;
+		/**
+		* The plotting style to use for the series that will be created. See <b>SeriesPlotStyle</b> enum for more details.
+		* @return int
+		*/
+		get plotStyle():SeriesPlotStyleType;
+	}
 	/**
 	* 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.
@@ -2857,40 +2878,15 @@ export namespace dh.plot {
 		get formatType():AxisFormatTypeType;
 		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;
+	export interface FigureDataUpdatedEvent {
+		getArray(series:Series, sourceType:number, mappingFunc?:(arg0:any)=>any):Array<any>;
+		get series():Series[];
 	}
-	/**
-	* Describes a template that will be used to make new series instances when a new table added to a plotBy.
-	*/
-	export interface MultiSeries {
-		/**
-		* The name for this multi-series.
-		* @return String
-		*/
-		get name():string;
-		/**
-		* The plotting style to use for the series that will be created. See <b>SeriesPlotStyle</b> enum for more details.
-		* @return int
-		*/
-		get plotStyle():SeriesPlotStyleType;
+	export interface OneClick {
+		setValueForColumn(columnName:string, value:any):void;
+		getValueForColumn(columName:string):any;
+		get requireAllFiltersToDisplay():boolean;
+		get columns():dh.Column[];
 	}
 	/**
 	* Provides access to the data for displaying in a figure.
@@ -2936,75 +2932,114 @@ export namespace dh.plot {
 		get multiSeries():MultiSeries;
 		get shapeLabel():string;
 	}
-	export interface FigureDataUpdatedEvent {
-		getArray(series:Series, sourceType:number, mappingFunc?:(arg0:any)=>any):Array<any>;
-		get series():Series[];
+	/**
+	* 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;
 	}
-	export interface OneClick {
-		setValueForColumn(columnName:string, value:any):void;
-		getValueForColumn(columName:string):any;
-		get requireAllFiltersToDisplay():boolean;
-		get columns():dh.Column[];
+
+	/**
+	* Provide the details for a chart.
+	*/
+	export class Chart implements dh.HasEventHandling {
+		/**
+		* a new series was added to this chart as part of a multi-series. The series instance is the detail for this event.
+		*/
+		static readonly EVENT_SERIES_ADDED:string;
+		/**
+		* The title of the chart.
+		* @return String
+		*/
+		readonly title?:string|null;
+
+		protected constructor();
+
+		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;
+		get column():number;
+		get showLegend():boolean;
+		/**
+		* The axes used in this chart.
+		* @return dh.plot.Axis
+		*/
+		get axes():Axis[];
+		get is3d():boolean;
+		get titleFont():string;
+		get colspan():number;
+		get titleColor():string;
+		get series():Series[];
+		get rowspan():number;
+		/**
+		* The type of this chart, see <b>ChartType</b> enum for more details.
+		* @return int
+		*/
+		get chartType():ChartTypeType;
+		get row():number;
+		get legendColor():string;
+		get legendFont():string;
+		get multiSeries():MultiSeries[];
 	}
 
-	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;
+	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;
 
-		constructor();
+		protected constructor();
 	}
 
 	/**
-	* Provides the details for a figure.
-	*
-	* The Deephaven JS API supports automatic lossless downsampling of time-series data, when that data is plotted in one
-	* or more line series. Using a scatter plot or a X-axis of some type other than DateTime will prevent this feature from
-	* being applied to a series. To enable this feature, invoke <b>Axis.range(...)</b> to specify the length in pixels of
-	* the axis on the screen, and the range of values that are visible, and the server will use that width (and range, if
-	* any) to reduce the number of points sent to the client.
-	*
-	* Downsampling can also be controlled when calling either <b>Figure.subscribe()</b> or <b>Series.subscribe()</b> - both
-	* can be given an optional <b>dh.plot.DownsampleOptions</b> argument. Presently only two valid values exist,
-	* <b>DEFAULT</b>, and <b>DISABLE</b>, and if no argument is specified, <b>DEFAULT</b> is assumed. If there are more
-	* than 30,000 rows in a table, downsampling will be encouraged - data will not load without calling
-	* <b>subscribe(DISABLE)</b> or enabling downsampling via <b>Axis.range(...)</b>. If there are more than 200,000 rows,
-	* data will refuse to load without downsampling and <b>subscribe(DISABLE)</b> would have no effect.
-	*
-	* Downsampled data looks like normal data, except that select items have been removed if they would be redundant in the
-	* UI given the current configuration. Individual rows are intact, so that a tooltip or some other UI item is sure to be
-	* accurate and consistent, and at least the highest and lowest value for each axis will be retained as well, to ensure
-	* that the "important" values are visible.
-	*
-	* Four events exist to help with interacting with downsampled data, all fired from the <b>Figure</b> instance itself.
-	* First, <b>downsampleneeded</b> indicates that more than 30,000 rows would be fetched, and so specifying downsampling
-	* is no longer optional - it must either be enabled (calling <b>axis.range(...)</b>), or disabled. If the figure is
-	* configured for downsampling, when a change takes place that requires that the server perform some downsampling work,
-	* the <b>downsamplestarted</b> event will first be fired, which can be used to present a brief loading message,
-	* indicating to the user why data is not ready yet - when the server side process is complete,
-	* <b>downsamplefinished</b> will be fired. These events will repeat when the range changes, such as when zooming,
-	* panning, or resizing the figure. Finally, <b>downsamplefailed</b> indicates that something when wrong when
-	* downsampling, or possibly that downsampling cannot be disabled due to the number of rows in the table.
-	*
-	* At this time, not marked as a ServerObject, due to internal implementation issues which leave the door open to
-	* client-created figures.
+	* Helper class to manage snapshots and deltas and keep not only a contiguous JS array of data per column in the
+	* underlying table, but also support a mapping function to let client code translate data in some way for display and
+	* keep that cached as well.
 	*/
+	export class ChartData {
+		constructor(table:dh.Table);
+
+		update(tableData:dh.SubscriptionTableData):void;
+		getColumn(columnName:string, mappingFunc:(arg0:any)=>any, currentUpdate:dh.TableData):Array<any>;
+		/**
+		* Removes some column from the cache, avoiding extra computation on incoming events, and possibly freeing some
+		* memory. If this pair of column name and map function are requested again, it will be recomputed from scratch.
+		*/
+		removeColumn(columnName:string, mappingFunc:(arg0:any)=>any):void;
+	}
+
 	export class Figure implements dh.HasEventHandling {
 		/**
 		* The title of the figure.
@@ -3048,8 +3083,7 @@ export namespace dh.plot {
 		*/
 		static readonly EVENT_DOWNSAMPLENEEDED:string;
 
-		protected constructor();
-
+		static create(config:FigureDescriptor):Promise<Figure>;
 		subscribe(forceDisableDownsample?:DownsampleOptions):void;
 		/**
 		* Disable updates for all series in this figure.
@@ -3087,78 +3121,7 @@ export namespace dh.plot {
 		* @return 
 		* @typeParam T - 
 		*/
-		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
-		static create(config:FigureDescriptor):Promise<Figure>;
-	}
-
-	/**
-	* Provide the details for a chart.
-	*/
-	export class Chart implements dh.HasEventHandling {
-		/**
-		* a new series was added to this chart as part of a multi-series. The series instance is the detail for this event.
-		*/
-		static readonly EVENT_SERIES_ADDED:string;
-		/**
-		* The title of the chart.
-		* @return String
-		*/
-		readonly title?:string|null;
-
-		protected constructor();
-
-		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;
-		get column():number;
-		get showLegend():boolean;
-		/**
-		* The axes used in this chart.
-		* @return dh.plot.Axis
-		*/
-		get axes():Axis[];
-		get is3d():boolean;
-		get titleFont():string;
-		get colspan():number;
-		get titleColor():string;
-		get series():Series[];
-		get rowspan():number;
-		/**
-		* The type of this chart, see <b>ChartType</b> enum for more details.
-		* @return int
-		*/
-		get chartType():ChartTypeType;
-		get row():number;
-		get legendColor():string;
-		get legendFont():string;
-		get multiSeries():MultiSeries[];
-	}
-
-	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();
+		removeEventListener<T>(name:string, callback:(e:CustomEvent<T>)=>void):boolean;
 	}
 
 	/**
@@ -3196,46 +3159,22 @@ export namespace dh.plot {
 	}
 
 	/**
-	* Helper class to manage snapshots and deltas and keep not only a contiguous JS array of data per column in the
-	* underlying table, but also support a mapping function to let client code translate data in some way for display and
-	* keep that cached as well.
+	* Helper class for plot downsampling methods.
 	*/
-	export class ChartData {
-		constructor(table:dh.Table);
+	export class Downsample {
+		protected constructor();
 
-		update(tableData:dh.SubscriptionTableData):void;
-		getColumn(columnName:string, mappingFunc:(arg0:any)=>any, currentUpdate:dh.TableData):Array<any>;
 		/**
-		* Removes some column from the cache, avoiding extra computation on incoming events, and possibly freeing some
-		* memory. If this pair of column name and map function are requested again, it will be recomputed from scratch.
+		* 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.
 		*/
-		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;
-		linesVisible?:boolean|null;
-		shapesVisible?:boolean|null;
-		gradientVisible?:boolean|null;
-		lineColor?:string|null;
-		pointLabelFormat?:string|null;
-		xToolTipPattern?:string|null;
-		yToolTipPattern?:string|null;
-		shapeLabel?:string|null;
-		shapeSize?:number|null;
-		shapeColor?:string|null;
-		shape?:string|null;
-		dataSources:Array<SourceDescriptor>;
-
-		constructor();
+		static runChartDownsample(table:dh.Table, xCol:string, yCols:string[], width:number, xRange?:dh.LongWrapper[]|undefined|null):Promise<dh.Table>;
 	}
 
 	export class FigureFetchError {
@@ -3252,6 +3191,30 @@ export namespace dh.plot {
 		get message():string;
 	}
 
+	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();
+	}
+
 	export class SourceDescriptor {
 		axis:AxisDescriptor;
 		table:dh.Table;
@@ -3261,40 +3224,32 @@ export namespace dh.plot {
 		constructor();
 	}
 
-	/**
-	* Helper class for plot downsampling methods.
-	*/
-	export class Downsample {
-		protected constructor();
+	export class FigureSourceException {
+		table:dh.Table;
+		source:SeriesDataSource;
 
-		/**
-		* 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>;
+		protected constructor();
 	}
 
+	export class SeriesDescriptor {
+		plotStyle:string;
+		name?:string|null;
+		linesVisible?:boolean|null;
+		shapesVisible?:boolean|null;
+		gradientVisible?:boolean|null;
+		lineColor?:string|null;
+		pointLabelFormat?:string|null;
+		xToolTipPattern?:string|null;
+		yToolTipPattern?:string|null;
+		shapeLabel?:string|null;
+		shapeSize?:number|null;
+		shapeColor?:string|null;
+		shape?:string|null;
+		dataSources:Array<SourceDescriptor>;
 
-	type AxisFormatTypeType = number;
-	export class AxisFormatType {
-		static readonly CATEGORY:AxisFormatTypeType;
-		static readonly NUMBER:AxisFormatTypeType;
+		constructor();
 	}
 
-	type AxisPositionType = number;
-	export class AxisPosition {
-		static readonly TOP:AxisPositionType;
-		static readonly BOTTOM:AxisPositionType;
-		static readonly LEFT:AxisPositionType;
-		static readonly RIGHT:AxisPositionType;
-		static readonly NONE:AxisPositionType;
-	}
 
 	type SeriesPlotStyleType = number;
 	export class SeriesPlotStyle {
@@ -3312,6 +3267,31 @@ export namespace dh.plot {
 		static readonly TREEMAP:SeriesPlotStyleType;
 	}
 
+	type AxisFormatTypeType = number;
+	export class AxisFormatType {
+		static readonly CATEGORY:AxisFormatTypeType;
+		static readonly NUMBER:AxisFormatTypeType;
+	}
+
+	type AxisPositionType = number;
+	export class AxisPosition {
+		static readonly TOP:AxisPositionType;
+		static readonly BOTTOM:AxisPositionType;
+		static readonly LEFT:AxisPositionType;
+		static readonly RIGHT:AxisPositionType;
+		static readonly NONE:AxisPositionType;
+	}
+
+	type AxisTypeType = number;
+	export class AxisType {
+		static readonly X:AxisTypeType;
+		static readonly Y:AxisTypeType;
+		static readonly SHAPE:AxisTypeType;
+		static readonly SIZE:AxisTypeType;
+		static readonly LABEL:AxisTypeType;
+		static readonly COLOR:AxisTypeType;
+	}
+
 	/**
 	* 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.
@@ -3356,20 +3336,17 @@ 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;
-	}
-
 }
 
 export namespace dh.lsp {
 
+	export class MarkupContent {
+		kind:string;
+		value:string;
+
+		constructor();
+	}
+
 	export class ParameterInformation {
 		label:string;
 		documentation:MarkupContent;
@@ -3377,6 +3354,28 @@ export namespace dh.lsp {
 		constructor();
 	}
 
+	export class TextDocumentContentChangeEvent {
+		range:Range;
+		rangeLength:number;
+		text:string;
+
+		constructor();
+	}
+
+	export class Hover {
+		contents:MarkupContent;
+		range:Range;
+
+		constructor();
+	}
+
+	export class TextEdit {
+		range:Range;
+		text:string;
+
+		constructor();
+	}
+
 	export class Range {
 		start:Position;
 		end:Position;
@@ -3399,9 +3398,11 @@ export namespace dh.lsp {
 		copy():Position;
 	}
 
-	export class MarkupContent {
-		kind:string;
-		value:string;
+	export class SignatureInformation {
+		label:string;
+		documentation:MarkupContent;
+		parameters:Array<ParameterInformation>;
+		activeParameter:number;
 
 		constructor();
 	}
@@ -3423,41 +3424,27 @@ export namespace dh.lsp {
 		constructor();
 	}
 
-	export class TextDocumentContentChangeEvent {
-		range:Range;
-		rangeLength:number;
-		text:string;
-
-		constructor();
-	}
-
-	export class TextEdit {
-		range:Range;
-		text:string;
+}
 
-		constructor();
-	}
 
-	export class Hover {
-		contents:MarkupContent;
-		range:Range;
+export namespace dh.calendar {
 
-		constructor();
+	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 class SignatureInformation {
-		label:string;
-		documentation:MarkupContent;
-		parameters:Array<ParameterInformation>;
-		activeParameter:number;
-
-		constructor();
+	export interface BusinessPeriod {
+		get close():string;
+		get open():string;
 	}
-
-}
-
-export namespace dh.calendar {
-
 	/**
 	* Defines a calendar with business hours and holidays.
 	*/
@@ -3488,22 +3475,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;
-	}
 
 	type DayOfWeekType = string;
 	export class DayOfWeek {
@@ -3519,4 +3490,3 @@ export namespace dh.calendar {
 	}
 
 }
-