@hpcc-js/dgrid 2.33.0 → 3.1.0

package/package.json

@@ -1,54 +1,50 @@
 {
     "name": "@hpcc-js/dgrid",
-    "version": "2.33.0",
+    "version": "3.1.0",
     "description": "hpcc-js - Viz DGrid",
-    "main": "dist/index.js",
-    "module": "dist/index.es6",
-    "browser": "dist/index.js",
-    "unpkg": "dist/index.min.js",
-    "jsdelivr": "dist/index.min.js",
-    "types": "types/index.d.ts",
-    "typesVersions": {
-        "<3.8": {
-            "*": [
-                "types-3.4/index.d.ts"
-            ]
-        }
+    "type": "module",
+    "exports": {
+        ".": {
+            "types": "./types/index.d.ts",
+            "default": "./dist/index.js"
+        },
+        "./dist/*": "./dist/*"
     },
+    "module": "./dist/index.js",
+    "browser": "./dist/index.js",
+    "types": "./types/index.d.ts",
     "files": [
         "dist/*",
-        "types/*",
-        "types-3.4/*",
-        "src/*"
+        "src/*",
+        "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo",
-        "compile-es6": "tsc --module es6 --outDir ./lib-es6",
-        "compile-es6-watch": "npm run compile-es6 -- -w",
-        "compile-umd": "tsc --module umd --outDir ./lib-umd",
-        "compile-umd-watch": "npm run compile-umd -- -w",
-        "bundle": "rollup -c",
-        "bundle-watch": "npm run bundle -- -w",
-        "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js",
-        "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
-        "build": "npm run compile-es6 && npm run bundle",
-        "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
+        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "bundle": "node esbuild.js",
+        "bundle-watch": "npm run bundle -- --development --watch",
+        "gen-types": "tsc --project tsconfig.json",
+        "gen-types-watch": "npm run gen-types -- --watch",
+        "build": "run-p gen-types bundle",
         "lint": "eslint ./src",
+        "lint-fix": "eslint --fix src/**/*.ts",
         "docs": "typedoc --options tdoptions.json .",
-        "update": "npx --yes npm-check-updates -u -t minor"
+        "test-browser": "vitest run --project browser",
+        "test": "vitest run",
+        "coverage": "vitest run --coverage",
+        "update": "npx --yes npm-check-updates -u -t minor",
+        "update-major": "npx -yes npm-check-updates -u"
     },
     "dependencies": {
-        "@hpcc-js/common": "^2.72.0",
-        "@hpcc-js/ddl-shim": "^2.21.0",
-        "@hpcc-js/dgrid-shim": "^2.25.0",
-        "@hpcc-js/util": "^2.52.0"
+        "@hpcc-js/common": "^3.2.0",
+        "@hpcc-js/dgrid-shim": "^3.1.0",
+        "@hpcc-js/util": "^3.2.0"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.12.0",
+        "@hpcc-js/ddl-shim": "^3.0.0",
+        "@hpcc-js/esbuild-plugins": "^1.3.0",
+        "@testing-library/dom": "10.4.0",
         "d3-format": "^1",
-        "d3-selection": "^1",
-        "tslib": "2.6.3"
+        "d3-selection": "^1"
     },
     "repository": {
         "type": "git",
@@ -61,5 +57,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "99332f074dd1fff0cbb8eae52c5b6c98d6ad5a7a"
+    "gitHead": "658c50fd965a7744ba8db675ba6878607c44d5e2"
 }

package/src/Common.ts

@@ -1,6 +1,6 @@
-import { HTMLWidget, publish } from "@hpcc-js/common";
-import { Grid, PagingGrid } from "@hpcc-js/dgrid-shim";
-import { DBStore } from "./DBStore";
+import { HTMLWidget } from "@hpcc-js/common";
+import { Grid, PagingGrid } from "./dgrid-shim.ts";
+import { DBStore } from "./DBStore.ts";
 
 import "../src/Common.css";
 
@@ -19,32 +19,6 @@ export class Common extends HTMLWidget {
         this._tag = "div";
     }
 
-    @publish("...empty...", "string", "No Data Message")
-    noDataMessage: publish<this, string>;
-    @publish("loading...", "string", "Loading Message")
-    loadingMessage: publish<this, string>;
-    @publish(false, "boolean", "Enable paging")
-    pagination: publish<this, boolean>;
-    @publish(25, "number", "Page size")
-    pageSize: publish<this, number>;
-    @publish(false, "boolean", "Enable sorting by column")
-    sortable: publish<this, boolean>;
-    @publish(null, "set", "Default 'sort by' Column ID", function () { return this.columns(); }, { optional: true })
-    sortBy: publish<this, string>;
-    @publish(false, "boolean", "Default 'sort by' descending", null, { disable: self => !self.sortBy() })
-    sortByDescending: publish<this, boolean>;
-    @publish(false, "boolean", "Multiple Selection")
-    multiSelect: publish<this, boolean>;
-    @publish(true, "boolean", "Render HTML")
-    renderHtml: publish<this, boolean>;
-
-    //  Backward Compatibility
-    mulitSelect(): boolean;
-    mulitSelect(_?: boolean): this;
-    mulitSelect(_?: boolean): this | boolean {
-        return this.multiSelect.apply(this, arguments);
-    }
-
     protected formatSortBy(): [{ property: string, descending: boolean }] | undefined {
         const idx = this.columns().indexOf(this.sortBy());
         return idx >= 0 ? [{ property: idx.toString(), descending: this.sortByDescending() }] : undefined;
@@ -58,7 +32,7 @@ export class Common extends HTMLWidget {
             const retVal = [];
             for (const id in this._dgrid.selection) {
                 if (this._dgrid.selection[id]) {
-                const storeItem = this._store.get(+id);
+                    const storeItem = this._store.get(+id);
                     retVal.push(this.rowToObj(storeItem));
                 }
             }
@@ -158,3 +132,35 @@ export class Common extends HTMLWidget {
     }
 }
 Common.prototype._class += " dgrid_Common";
+
+export interface Common {
+    noDataMessage(): string;
+    noDataMessage(_: string): this;
+    loadingMessage(): string;
+    loadingMessage(_: string): this;
+    pagination(): boolean;
+    pagination(_: boolean): this;
+    pageSize(): number;
+    pageSize(_: number): this;
+    sortable(): boolean;
+    sortable(_: boolean): this;
+    sortBy(): string;
+    sortBy(_: string): this;
+    sortByDescending(): boolean;
+    sortByDescending(_: boolean): this;
+    multiSelect(): boolean;
+    multiSelect(_: boolean): this;
+    renderHtml(): boolean;
+    renderHtml(_: boolean): this;
+}
+
+Common.prototype.publish("noDataMessage", "...empty...", "string", "No Data Message");
+Common.prototype.publish("loadingMessage", "loading...", "string", "Loading Message");
+Common.prototype.publish("pagination", false, "boolean", "Enable paging");
+Common.prototype.publish("pageSize", 25, "number", "Page size");
+Common.prototype.publish("sortable", false, "boolean", "Enable sorting by column");
+Common.prototype.publish("sortBy", null, "set", "Default 'sort by' Column ID", function (this: Common) { return this.columns(); }, { optional: true });
+Common.prototype.publish("sortByDescending", false, "boolean", "Default 'sort by' descending", undefined, { disable: self => !self.sortBy() });
+Common.prototype.publish("multiSelect", false, "boolean", "Multiple Selection");
+Common.prototype.publish("renderHtml", true, "boolean", "Render HTML");
+

package/src/DBStore.ts

@@ -1,6 +1,6 @@
 import { Database } from "@hpcc-js/common";
-import { Deferred } from "@hpcc-js/dgrid-shim";
-import { CellFormatter, CellRenderer, ColumnType, RowFormatter } from "./RowFormatter";
+import { Deferred } from "./dgrid-shim.ts";
+import { CellFormatter, CellRenderer, ColumnType, RowFormatter } from "./RowFormatter.ts";
 
 export class DBStore {
     private _db: Database.Grid;

package/src/DatasourceStore.ts

@@ -1,6 +1,6 @@
-import { DDL2 } from "@hpcc-js/ddl-shim";
-import { Deferred, QueryResults } from "@hpcc-js/dgrid-shim";
-import { ColumnType, RowFormatter } from "./RowFormatter";
+import type { DDL2 } from "@hpcc-js/ddl-shim";
+import { Deferred, QueryResults } from "./dgrid-shim.ts";
+import { ColumnType, RowFormatter } from "./RowFormatter.ts";
 
 export interface IDatasource {
     id: () => string;

package/src/DatasourceTable.ts

@@ -1,18 +1,15 @@
-import { publish, Widget } from "@hpcc-js/common";
-import { Memory } from "@hpcc-js/dgrid-shim";
-import { Common } from "./Common";
-import { DatasourceStore, IDatasource } from "./DatasourceStore";
+import { Widget } from "@hpcc-js/common";
+import { Memory } from "./dgrid-shim.ts";
+import { Common } from "./Common.ts";
+import { DatasourceStore, IDatasource } from "./DatasourceStore.ts";
 
 export class DatasourceTable extends Common {
-    _prevDatasource: IDatasource;
+    _prevDatasource?: IDatasource;
 
     constructor() {
         super();
     }
 
-    @publish(null, "object", "Datasource")
-    datasource: { (): IDatasource; (_: IDatasource): DatasourceTable };
-
     invalidate(): this {
         delete this._prevDatasource;
         return this;
@@ -55,3 +52,11 @@ export class DatasourceTable extends Common {
     }
 }
 DatasourceTable.prototype._class += " dgrid_DatasourceTable";
+
+export interface DatasourceTable {
+    datasource(): IDatasource;
+    datasource(_: IDatasource): this;
+}
+
+DatasourceTable.prototype.publish("datasource", null, "object", "Datasource");
+

package/src/Table.ts

@@ -1,9 +1,9 @@
-import { Palette, PropertyExt } from "@hpcc-js/common";
+import { Palette, PropertyExt, Field } from "@hpcc-js/common";
 import { hashSum } from "@hpcc-js/util";
 import { format as d3Format } from "d3-format";
 import { select as d3Select } from "d3-selection";
-import { Common } from "./Common";
-import { CellFormatter, CellRenderer, ColumnType, RowType } from "./RowFormatter";
+import { Common } from "./Common.ts";
+import { CellFormatter, CellRenderer, ColumnType, RowType } from "./RowFormatter.ts";
 
 //  ColumnPalette ---
 export class ColumnFormat extends PropertyExt {
@@ -54,7 +54,7 @@ export class ColumnFormat extends PropertyExt {
                 }
                 const value = valueColIdx ? row.__origRow[valueColIdx] : cell;
                 const background = palette(value, min, max);
-                const cellText = defaultFormatter.call(this, cell, row);
+                const cellText: any = defaultFormatter.call(this, cell, row);
                 d3Select(cellElement)
                     .style("background", background)
                     .style("color", background && Palette.textColor(background))
@@ -102,8 +102,10 @@ export class Table extends Common {
         super();
     }
 
-    fields(_?: any): any | this {
-        const retVal = super.fields.apply(this, arguments);
+    fields(): Field[];
+    fields(_: Field[]): this;
+    fields(_?: Field[]): Field[] | this {
+        const retVal = super.fields.apply(this, arguments as any);
         if (arguments.length) {
             const hash = hashSum({ _ });
             if (this._prevFieldsHash !== hash) {
@@ -114,8 +116,10 @@ export class Table extends Common {
         return retVal;
     }
 
-    columns(_?: any): any | this {
-        const retVal = super.columns.apply(this, arguments);
+    columns(): string[];
+    columns(_: string[], asDefault?: boolean): this;
+    columns(_?: string[], asDefault?: boolean): string[] | this {
+        const retVal = super.columns.apply(this, arguments as any);
         if (arguments.length) {
             const hash = hashSum({ _ });
             if (this._prevColsHash !== hash) {
@@ -126,8 +130,10 @@ export class Table extends Common {
         return retVal;
     }
 
+    data(): any;
+    data(_: any): this;
     data(_?: any): any | this {
-        const retVal = super.data.apply(this, arguments);
+        const retVal = super.data.apply(this, arguments as any);
         if (arguments.length) {
             this._dataRefresh = true;
         }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/dgrid";
-export const PKG_VERSION = "2.33.0";
-export const BUILD_VERSION = "2.106.0";
+export const PKG_VERSION = "3.1.0";
+export const BUILD_VERSION = "3.2.0";

package/src/dgrid-shim.ts

@@ -0,0 +1,12 @@
+import type * as dgrid_shim from "@hpcc-js/dgrid-shim";
+
+if (!globalThis["@hpcc-js/dgrid-shim"]) {
+    console.error("dgrid-shim not loaded, please add `<script src=\"https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js\"></script>` or similar to your HTML file");
+}
+
+export const Deferred = globalThis["@hpcc-js/dgrid-shim"].Deferred as typeof dgrid_shim.Deferred;
+export const Memory = globalThis["@hpcc-js/dgrid-shim"].Memory as typeof dgrid_shim.Memory;
+export const QueryResults = globalThis["@hpcc-js/dgrid-shim"].QueryResults as typeof dgrid_shim.QueryResults;
+export const Grid = globalThis["@hpcc-js/dgrid-shim"].Grid as typeof dgrid_shim.Grid;
+export const PagingGrid = globalThis["@hpcc-js/dgrid-shim"].PagingGrid as typeof dgrid_shim.PagingGrid;
+export const domConstruct = globalThis["@hpcc-js/dgrid-shim"].domConstruct as typeof dgrid_shim.domConstruct;

package/src/index.ts

@@ -1,11 +1,10 @@
-export * from "./__package__";
-export * from "./Common";
-export * from "./DatasourceStore";
-export * from "./DatasourceTable";
-export * from "./DBStore";
-export * from "./RowFormatter";
-export * from "./Table";
+export * from "./__package__.ts";
+export * from "./Common.ts";
+export * from "./DatasourceStore.ts";
+export * from "./DatasourceTable.ts";
+export * from "./DBStore.ts";
+export * from "./RowFormatter.ts";
+export * from "./Table.ts";
 
 //  Must be last...
-export { Deferred, domConstruct, Memory, QueryResults } from "@hpcc-js/dgrid-shim";
-
+export { Deferred, Memory, QueryResults, Grid, PagingGrid, domConstruct } from "./dgrid-shim.ts";

package/types/Common.d.ts

@@ -1,5 +1,5 @@
-import { HTMLWidget, publish } from "@hpcc-js/common";
-import { DBStore } from "./DBStore";
+import { HTMLWidget } from "@hpcc-js/common";
+import { DBStore } from "./DBStore.ts";
 import "../src/Common.css";
 export declare class Common extends HTMLWidget {
     protected _columns: any[];
@@ -11,17 +11,6 @@ export declare class Common extends HTMLWidget {
     private _prevSortByDescending;
     private _prevMultiSelect;
     constructor();
-    noDataMessage: publish<this, string>;
-    loadingMessage: publish<this, string>;
-    pagination: publish<this, boolean>;
-    pageSize: publish<this, number>;
-    sortable: publish<this, boolean>;
-    sortBy: publish<this, string>;
-    sortByDescending: publish<this, boolean>;
-    multiSelect: publish<this, boolean>;
-    renderHtml: publish<this, boolean>;
-    mulitSelect(): boolean;
-    mulitSelect(_?: boolean): this;
     protected formatSortBy(): [{
         property: string;
         descending: boolean;
@@ -34,4 +23,23 @@ export declare class Common extends HTMLWidget {
     exit(domNode: any, element: any): void;
     click(row: any, col: any, sel: any, more: any): void;
 }
-//# sourceMappingURL=Common.d.ts.map
+export interface Common {
+    noDataMessage(): string;
+    noDataMessage(_: string): this;
+    loadingMessage(): string;
+    loadingMessage(_: string): this;
+    pagination(): boolean;
+    pagination(_: boolean): this;
+    pageSize(): number;
+    pageSize(_: number): this;
+    sortable(): boolean;
+    sortable(_: boolean): this;
+    sortBy(): string;
+    sortBy(_: string): this;
+    sortByDescending(): boolean;
+    sortByDescending(_: boolean): this;
+    multiSelect(): boolean;
+    multiSelect(_: boolean): this;
+    renderHtml(): boolean;
+    renderHtml(_: boolean): this;
+}

package/types/DBStore.d.ts

@@ -1,5 +1,5 @@
 import { Database } from "@hpcc-js/common";
-import { CellFormatter, CellRenderer, ColumnType } from "./RowFormatter";
+import { CellFormatter, CellRenderer, ColumnType } from "./RowFormatter.ts";
 export declare class DBStore {
     private _db;
     Model: null;
@@ -21,4 +21,3 @@ export declare class DBStore {
     }): Promise<object[]>;
     sort(opts: any): this;
 }
-//# sourceMappingURL=DBStore.d.ts.map

package/types/DatasourceStore.d.ts

@@ -1,5 +1,5 @@
-import { DDL2 } from "@hpcc-js/ddl-shim";
-import { ColumnType } from "./RowFormatter";
+import type { DDL2 } from "@hpcc-js/ddl-shim";
+import { ColumnType } from "./RowFormatter.ts";
 export interface IDatasource {
     id: () => string;
     hash: () => string;
@@ -40,4 +40,3 @@ export declare class DatasourceStore {
     }>;
     fetchRange(options: any): Promise<any[]>;
 }
-//# sourceMappingURL=DatasourceStore.d.ts.map

package/types/DatasourceTable.d.ts

@@ -1,17 +1,16 @@
 import { Widget } from "@hpcc-js/common";
-import { Common } from "./Common";
-import { IDatasource } from "./DatasourceStore";
+import { Common } from "./Common.ts";
+import { IDatasource } from "./DatasourceStore.ts";
 export declare class DatasourceTable extends Common {
-    _prevDatasource: IDatasource;
+    _prevDatasource?: IDatasource;
     constructor();
-    datasource: {
-        (): IDatasource;
-        (_: IDatasource): DatasourceTable;
-    };
     invalidate(): this;
     enter(domNode: any, element: any): void;
     update(domNode: any, element: any): void;
     render(callback?: (w: Widget) => void): this;
     click(row: any, col: any, sel: any): void;
 }
-//# sourceMappingURL=DatasourceTable.d.ts.map
+export interface DatasourceTable {
+    datasource(): IDatasource;
+    datasource(_: IDatasource): this;
+}

package/types/RowFormatter.d.ts

@@ -35,4 +35,3 @@ export declare class RowFormatter {
     }, rowIdx?: number): number;
     row(): {};
 }
-//# sourceMappingURL=RowFormatter.d.ts.map

package/types/Table.d.ts

@@ -1,6 +1,6 @@
-import { PropertyExt } from "@hpcc-js/common";
-import { Common } from "./Common";
-import { CellFormatter, CellRenderer } from "./RowFormatter";
+import { PropertyExt, Field } from "@hpcc-js/common";
+import { Common } from "./Common.ts";
+import { CellFormatter, CellRenderer } from "./RowFormatter.ts";
 export declare class ColumnFormat extends PropertyExt {
     _owner: Table;
     constructor();
@@ -32,9 +32,12 @@ export declare class Table extends Common {
     _colsRefresh: boolean;
     _dataRefresh: boolean;
     constructor();
-    fields(_?: any): any | this;
-    columns(_?: any): any | this;
-    data(_?: any): any | this;
+    fields(): Field[];
+    fields(_: Field[]): this;
+    columns(): string[];
+    columns(_: string[], asDefault?: boolean): this;
+    data(): any;
+    data(_: any): this;
     enter(domNode: any, element: any): void;
     guessWidth(columns: any, data: any): void;
     _prevHash: any;
@@ -50,4 +53,3 @@ export interface Table {
     columnFormats(): ColumnFormat[];
     columnFormats(_: ColumnFormat[]): this;
 }
-//# sourceMappingURL=Table.d.ts.map

package/types/__package__.d.ts

@@ -1,4 +1,3 @@
 export declare const PKG_NAME = "@hpcc-js/dgrid";
-export declare const PKG_VERSION = "2.33.0";
-export declare const BUILD_VERSION = "2.106.0";
-//# sourceMappingURL=__package__.d.ts.map
+export declare const PKG_VERSION = "3.1.0";
+export declare const BUILD_VERSION = "3.2.0";

package/types/dgrid-shim.d.ts

@@ -0,0 +1,7 @@
+import type * as dgrid_shim from "@hpcc-js/dgrid-shim";
+export declare const Deferred: typeof dgrid_shim.Deferred;
+export declare const Memory: typeof dgrid_shim.Memory;
+export declare const QueryResults: typeof dgrid_shim.QueryResults;
+export declare const Grid: typeof dgrid_shim.Grid;
+export declare const PagingGrid: typeof dgrid_shim.PagingGrid;
+export declare const domConstruct: typeof dgrid_shim.domConstruct;

package/types/index.d.ts

@@ -1,9 +1,8 @@
-export * from "./__package__";
-export * from "./Common";
-export * from "./DatasourceStore";
-export * from "./DatasourceTable";
-export * from "./DBStore";
-export * from "./RowFormatter";
-export * from "./Table";
-export { Deferred, domConstruct, Memory, QueryResults } from "@hpcc-js/dgrid-shim";
-//# sourceMappingURL=index.d.ts.map
+export * from "./__package__.ts";
+export * from "./Common.ts";
+export * from "./DatasourceStore.ts";
+export * from "./DatasourceTable.ts";
+export * from "./DBStore.ts";
+export * from "./RowFormatter.ts";
+export * from "./Table.ts";
+export { Deferred, Memory, QueryResults, Grid, PagingGrid, domConstruct } from "./dgrid-shim.ts";