@hpcc-js/chart 3.1.0 → 3.3.0

package/package.json

@@ -1,47 +1,48 @@
 {
     "name": "@hpcc-js/chart",
-    "version": "3.1.0",
+    "version": "3.3.0",
     "description": "hpcc-js - Viz Chart",
     "type": "module",
+    "main": "./dist/index.umd.cjs",
+    "module": "./dist/index.js",
     "exports": {
         ".": {
             "types": "./types/index.d.ts",
-            "default": "./dist/index.js"
-        }
+            "import": "./dist/index.js",
+            "require": "./dist/index.umd.cjs"
+        },
+        "./dist/*": "./dist/*"
     },
-    "module": "./dist/index.js",
-    "browser": "./dist/index.js",
+    "browser": "./dist/index.umd.cjs",
     "types": "./types/index.d.ts",
     "files": [
         "dist/*",
         "src/*",
-        "types/*",
-        "font-awesome/**/*"
+        "types/*"
     ],
     "scripts": {
         "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
-        "bundle": "node esbuild.js",
-        "bundle-watch": "npm run bundle -- --development --watch",
+        "bundle": "vite build",
+        "bundle-watch": "vite --port 5500",
         "gen-types": "tsc --project tsconfig.json",
         "gen-types-watch": "npm run gen-types -- --watch",
         "build": "run-p gen-types bundle",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "lint-fix": "eslint --fix src/**/*.ts",
         "docs": "typedoc --options tdoptions.json .",
         "test-browser": "vitest run --project browser",
         "test": "vitest run",
         "coverage": "vitest run --coverage",
-        "update": "npx -y npm-check-updates -u -t minor"
+        "update": "npx --yes npm-check-updates -u -t minor",
+        "update-major": "npx --yes npm-check-updates -u"
     },
     "dependencies": {
-        "@hpcc-js/api": "^3.1.0",
-        "@hpcc-js/common": "^3.1.0",
-        "@hpcc-js/util": "^3.1.0"
+        "@hpcc-js/api": "^3.3.0",
+        "@hpcc-js/common": "^3.3.0",
+        "@hpcc-js/util": "^3.3.0"
     },
     "devDependencies": {
-        "@hpcc-js/dataflow": "^9.1.0",
-        "@hpcc-js/esbuild-plugins": "^1.2.0",
+        "@hpcc-js/esbuild-plugins": "^1.4.0",
         "@types/d3-shape": "1.3.12",
         "@types/d3-transition": "1.3.6",
         "d3-array": "^1",
@@ -75,5 +76,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "3f6146539f487dca08a35cdd5f94ca29609b4343"
+    "gitHead": "145a4d4c8189c70f08e9804e63959d6dd398bd9f"
 }

package/src/Axis.ts

@@ -113,13 +113,13 @@ export class Axis extends SVGWidget {
         return true;
     }
 
-    domain(_) {
+    domain(_?) {
         if (!arguments.length) return this.d3Scale.domain();
         this.d3Scale.domain(_);
         return this;
     }
 
-    range(_) {
+    range(_?) {
         if (!arguments.length) {
             if (this.d3Scale.rangeRoundBands) {
                 return this.d3Scale.rangeExtent();
@@ -746,7 +746,7 @@ Axis.prototype.publish("padding", 0, "number", "Padding space at top of axis (pi
 Axis.prototype._origType = Axis.prototype.type;
 Axis.prototype.type = function (_?: string) {
     const retVal = Axis.prototype._origType.apply(this, arguments);
-    if (arguments.length) {
+    if (_ !== undefined) {
         this._type = _;
         this.updateScale();
     }
@@ -756,7 +756,7 @@ Axis.prototype.type = function (_?: string) {
 Axis.prototype._origTimePattern = Axis.prototype.timePattern;
 Axis.prototype.timePattern = function (_?: string) {
     const retVal = Axis.prototype._origTimePattern.apply(this, arguments);
-    if (arguments.length) {
+    if (_ !== undefined) {
         this._timePattern = _;
         this.updateScale();
     }

package/src/Bubble.ts

@@ -163,29 +163,34 @@ export class Bubble extends SVGWidget {
         super.exit(domNode, element);
     }
 
-    paletteID: { (): string; (_: string): Bubble; };
-    useClonedPalette: { (): boolean; (_: boolean): Bubble; };
+}
+Bubble.prototype._class += " chart_Bubble";
+Bubble.prototype.implements(I2DChart.prototype);
+Bubble.prototype.implements(ITooltip.prototype);
+Bubble.prototype.mixin(Utility.SimpleSelectionMixin);
+
+export interface Bubble {
+    paletteID(): string;
+    paletteID(_: string): this;
+    useClonedPalette(): boolean;
+    useClonedPalette(_: boolean): this;
 
     //  I2DChart
     _palette;
-    fillColor: (row: any[], column: string, value: number) => string;
-    textColor: (row: any[], column: string, value: number) => string;
-    click: (row, column, selected) => void;
-    dblclick: (row, column, selected) => void;
+    fillColor(row: any[], column: string, value: number): string;
+    textColor(row: any[], column: string, value: number): string;
+    click(row, column, selected): void;
+    dblclick(row, column, selected): void;
 
     //  ITooltip
     tooltip;
-    tooltipHTML: (_) => string;
-    tooltipFormat: (_) => string;
-    tooltipStyle: () => "default" | "none" | "series-table";
+    tooltipHTML(_): string;
+    tooltipFormat(_): string;
+    tooltipStyle(): "default" | "none" | "series-table";
 
     //  SimpleSelectionMixin
     _selection;
 }
-Bubble.prototype._class += " chart_Bubble";
-Bubble.prototype.implements(I2DChart.prototype);
-Bubble.prototype.implements(ITooltip.prototype);
-Bubble.prototype.mixin(Utility.SimpleSelectionMixin);
 
 Bubble.prototype.publish("paletteID", "default", "set", "Color palette for this widget", Bubble.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
 Bubble.prototype.publish("useClonedPalette", false, "boolean", "Enable or disable using a cloned palette", null, { tags: ["Intermediate", "Shared"] });

package/src/Bullet.ts

@@ -112,7 +112,6 @@ export class Bullet extends HTMLWidget {
                 titleWidth = bbox.width;
             }
         });
-        titleWidth; //  Gap between title and bullet bar.
 
         //  Bullet Chart ---
         const chart = d3Bullet()

package/src/Column.ts

@@ -572,17 +572,6 @@ export class Column extends XYAxis {
     innerText(origRow, lparam, idx): string {
         return origRow[0];
     }
-
-    //  INDChart  ---
-    fillColor: (row, column, value, origRow) => string;
-    textColor: (row, column, value, origRow) => string;
-    dblclick: (row, column, selected) => void;
-
-    //  ITooltip  ---
-    tooltip;
-    tooltipHTML: (_) => string;
-    tooltipFormat: (_) => string;
-    tooltipStyle: () => "default" | "none" | "series-table";
 }
 Column.prototype._class += " chart_Column";
 Column.prototype.implements(INDChart.prototype);
@@ -626,6 +615,18 @@ export interface Column {
     innerTextPadding_exists(): boolean;
     tooltipInnerTextEllipsedOnly(): boolean;
     tooltipInnerTextEllipsedOnly(_: boolean): this;
+
+    //  INDChart  ---
+    fillColor(row, column, value, origRow): string;
+    textColor(row, column, value, origRow): string;
+    dblclick(row, column, selected): void;
+
+    //  ITooltip  ---
+    tooltip;
+    tooltipHTML(_): string;
+    tooltipFormat(_): string;
+    tooltipStyle(): "default" | "none" | "series-table";
+    tooltipStyle(_: "default" | "none" | "series-table"): this;
 }
 
 Column.prototype.publish("valueFontFamily", null, "string", "Font family of value text", null, { optional: true });

package/src/D3Cloud.ts

@@ -26,7 +26,7 @@ export function d3Cloud() {
     let random = Math.random;
     let canvas = cloudCanvas;
 
-    cloud.canvas = function (_) {
+    cloud.canvas = function (_?) {
         return arguments.length ? (canvas = functor(_), cloud) : canvas;
     };
 
@@ -149,51 +149,51 @@ export function d3Cloud() {
         return false;
     }
 
-    cloud.timeInterval = function (_) {
+    cloud.timeInterval = function (_?) {
         return arguments.length ? (timeInterval = _ == null ? Infinity : _, cloud) : timeInterval;
     };
 
-    cloud.words = function (_) {
+    cloud.words = function (_?) {
         return arguments.length ? (words = _, cloud) : words;
     };
 
-    cloud.size = function (_) {
+    cloud.size = function (_?) {
         return arguments.length ? (size = [+_[0], +_[1]], cloud) : size;
     };
 
-    cloud.font = function (_) {
+    cloud.font = function (_?) {
         return arguments.length ? (font = functor(_), cloud) : font;
     };
 
-    cloud.fontStyle = function (_) {
+    cloud.fontStyle = function (_?) {
         return arguments.length ? (fontStyle = functor(_), cloud) : fontStyle;
     };
 
-    cloud.fontWeight = function (_) {
+    cloud.fontWeight = function (_?) {
         return arguments.length ? (fontWeight = functor(_), cloud) : fontWeight;
     };
 
-    cloud.rotate = function (_) {
+    cloud.rotate = function (_?) {
         return arguments.length ? (rotate = functor(_), cloud) : rotate;
     };
 
-    cloud.text = function (_) {
+    cloud.text = function (_?) {
         return arguments.length ? (text = functor(_), cloud) : text;
     };
 
-    cloud.spiral = function (_) {
+    cloud.spiral = function (_?) {
         return arguments.length ? (spiral = spirals[_] || _, cloud) : spiral;
     };
 
-    cloud.fontSize = function (_) {
+    cloud.fontSize = function (_?) {
         return arguments.length ? (fontSize = functor(_), cloud) : fontSize;
     };
 
-    cloud.padding = function (_) {
+    cloud.padding = function (_?) {
         return arguments.length ? (padding = functor(_), cloud) : padding;
     };
 
-    cloud.random = function (_) {
+    cloud.random = function (_?) {
         return arguments.length ? (random = _, cloud) : random;
     };
 
@@ -270,7 +270,10 @@ function cloudSprite(contextAndRatio, d, data, di) {
         c.translate((x + (w >> 1)) / ratio, (y + (h >> 1)) / ratio);
         if (d.rotate) c.rotate(d.rotate * cloudRadians);
         c.fillText(d.text, 0, 0);
-        if (d.padding) c.lineWidth = 2 * d.padding, c.strokeText(d.text, 0, 0);
+        if (d.padding) {
+            c.lineWidth = 2 * d.padding;
+            c.strokeText(d.text, 0, 0);
+        }
         c.restore();
         d.width = w;
         d.height = h;

package/src/HexBin.ts

@@ -118,21 +118,26 @@ export class HexBin extends XYAxis {
     dblclick(row: object[], column, selected) {
         // console.log("Click:  " + JSON.stringify(row) + ", " + column + ", " + selected);
     }
+}
+HexBin.prototype._class += " chart_HexBin";
+HexBin.prototype.implements(I2DAggrChart.prototype);
+HexBin.prototype.implements(ITooltip.prototype);
 
+export interface HexBin {
     //  ITooltip
     tooltip;
-    tooltipHTML: (_) => string;
-    tooltipFormat: (_) => string;
-    tooltipValueFormat: (_) => string;
-    tooltipValueFormat_default: (_) => string;
+    tooltipHTML(_): string;
+    tooltipFormat(_): string;
+    tooltipValueFormat(_): string;
+    tooltipValueFormat_default(_): string;
 
-    paletteID: { (): string; (_: string): HexBin; };
-    useClonedPalette: { (): boolean; (_: boolean): HexBin; };
-    binSize: { (): number; (_: number): HexBin; };
+    paletteID(): string;
+    paletteID(_: string): this;
+    useClonedPalette(): boolean;
+    useClonedPalette(_: boolean): this;
+    binSize(): number;
+    binSize(_: number): this;
 }
-HexBin.prototype._class += " chart_HexBin";
-HexBin.prototype.implements(I2DAggrChart.prototype);
-HexBin.prototype.implements(ITooltip.prototype);
 
 HexBin.prototype.publish("paletteID", "Blues", "set", "Color palette for this widget", HexBin.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
 HexBin.prototype.publish("useClonedPalette", false, "boolean", "Enable or disable using a cloned palette", null, { tags: ["Intermediate", "Shared"] });

package/src/Pie.ts

@@ -437,38 +437,12 @@ export class Pie extends SVGWidget {
             })
             ;
     }
-
-    paletteID: (_?: string) => string | Pie;
-    useClonedPalette: (_?: boolean) => boolean | Pie;
-    outerText: (_?: boolean) => boolean | Pie;
-    innerRadius: { (): number; (_: number): Pie; };
-    innerRadius_exists: () => boolean;
-
-    //  I2DChart
-    _palette;
-    fillColor: (row: any[], column: string, value: number) => string;
-    textColor: (row: any[], column: string, value: number) => string;
-    click: (row, column, selected) => void;
-    dblclick: (row, column, selected) => void;
-
-    //  ITooltip
-    tooltip;
-    tooltipHTML: (_) => string;
-    tooltipFormat: (_) => string;
-    tooltipStyle: () => "default" | "none" | "series-table";
-    tooltipTick: { (): boolean; (_: boolean): Pie; };
-    tooltipTick_default: { (): boolean; (_: boolean): Pie; };
-    tooltipOffset: { (): number; (_: number): Pie; };
-    tooltipOffset_default: { (): number; (_: number): Pie; };
-
-    //  SimpleSelectionMixin
-    _selection: Utility.SimpleSelection;
 }
-
 Pie.prototype._class += " chart_Pie";
 Pie.prototype.implements(I2DChart.prototype);
 Pie.prototype.implements(ITooltip.prototype);
 Pie.prototype.mixin(Utility.SimpleSelectionMixin);
+
 export interface Pie {
     showSeriesValue(): boolean;
     showSeriesValue(_: boolean): this;
@@ -488,6 +462,36 @@ export interface Pie {
     showLabels(_: boolean): this;
     sortDataByValue(): "none" | "ascending" | "descending";
     sortDataByValue(_: "none" | "ascending" | "descending"): this;
+
+    paletteID(_?: string): string | Pie;
+    useClonedPalette(_?: boolean): boolean | Pie;
+    outerText(_?: boolean): boolean | Pie;
+    innerRadius(): number;
+    innerRadius_exists(): boolean;
+
+    //  I2DChart
+    _palette;
+    fillColor(row: any[], column: string, value: number): string;
+    textColor(row: any[], column: string, value: number): string;
+    click(row, column, selected): void;
+    dblclick(row, column, selected): void;
+
+    //  ITooltip
+    tooltip;
+    tooltipHTML(_): string;
+    tooltipFormat(_): string;
+    tooltipStyle(): "default" | "none" | "series-table";
+    tooltipTick(): boolean;
+    tooltipTick(_: boolean): Pie;
+    tooltipTick_default(): boolean;
+    tooltipTick_default(_: boolean): Pie;
+    tooltipOffset(): number;
+    tooltipOffset(_: number): Pie;
+    tooltipOffset_default(): number;
+    tooltipOffset_default(_: number): Pie;
+
+    //  SimpleSelectionMixin
+    _selection: Utility.SimpleSelection;
 }
 Pie.prototype.publish("showLabels", true, "boolean", "If true, wedge labels will display");
 Pie.prototype.publish("showSeriesValue", false, "boolean", "Append data series value next to label", null, { disable: w => !w.showLabels() });

package/src/Radar.ts

@@ -282,21 +282,6 @@ export class Radar extends SVGWidget {
         }
         return inside;
     }
-
-    //  INDChart
-    _palette;
-    fillColor: (row, column, value) => string;
-    strokeColor: (row, column, value) => string;
-    textColor: (row, column, value) => string;
-    click: (row, column, selected) => void;
-    dblclick: (row, column, selected) => void;
-
-    //  ITooltip
-    tooltip;
-    tooltipHTML: (_) => string;
-    tooltipFormat: (_) => string;
-
-    _selection;
 }
 Radar.prototype._class += " chart_Radar";
 Radar.prototype.implements(INDChart.prototype);
@@ -324,6 +309,21 @@ export interface Radar {
     pointShape(_: string): this;
     pointSize(): number;
     pointSize(_: number): this;
+
+    //  INDChart
+    _palette;
+    fillColor(row, column, value): string;
+    strokeColor(row, column, value): string;
+    textColor(row, column, value): string;
+    click(row, column, selected): void;
+    dblclick(row, column, selected): void;
+
+    //  ITooltip
+    tooltip;
+    tooltipHTML(_): string;
+    tooltipFormat(_): string;
+
+    _selection;
 }
 
 Radar.prototype.publish("paletteID", "default", "set", "Color palette for this widget", Radar.prototype._palette.switch());

package/src/RadialBar.ts

@@ -168,24 +168,12 @@ export class RadialBar extends SVGWidget {
         return degrees * Math.PI / 180;
     }
 
-    //  INDChart
-    _palette;
-    fillColor: (row, column, value) => string;
-    strokeColor: (row, column, value) => string;
-    textColor: (row, column, value) => string;
-    click: (row, column, selected) => void;
-    dblclick: (row, column, selected) => void;
-
-    //  ITooltip
-    tooltip;
-    tooltipHTML: (_) => string;
-    tooltipFormat: (_) => string;
-    _selection;
 }
 RadialBar.prototype._class += " chart_RadialBar";
 RadialBar.prototype.implements(INDChart.prototype);
 RadialBar.prototype.implements(ITooltip.prototype);
 RadialBar.prototype.mixin(Utility.SimpleSelectionMixin);
+
 export interface RadialBar {
     paletteID(): string;
     paletteID(_: string): this;
@@ -202,7 +190,24 @@ export interface RadialBar {
     transitionDelay(_: number): this;
     transitionDuration(): number;
     transitionDuration(_: number): this;
+
+    //  INDChart
+    _palette;
+    fillColor(row, column, value): string;
+    strokeColor(row, column, value): string;
+    textColor(row, column, value): string;
+    click(row, column, selected): void;
+    dblclick(row, column, selected): void;
+
+    //  ITooltip
+    tooltip;
+    tooltipHTML(_): string;
+    tooltipFormat(_): string;
+
+    //  SimpleSelectionMixin
+    _selection;
 }
+
 RadialBar.prototype.publish("paletteID", "default", "set", "Color palette for this widget", RadialBar.prototype._palette.switch());
 RadialBar.prototype.publish("tickCount", 10, "number", "Number of ticks to display");
 RadialBar.prototype.publish("domainPadding", 0.25, "number", "Padding between chart edge and container edge (0..1)");

package/src/Scatter.ts

@@ -321,34 +321,13 @@ export class Scatter extends XYAxis {
     exit(domNode, element) {
         super.exit(domNode, element);
     }
-
-    paletteID: { (): string; (_: string): Scatter; };
-    useClonedPalette: { (): boolean; (_: boolean): Scatter; };
-    pointSizeScale: { (): string; (_: string): Scatter; };
-    pointShape: { (): string; (_: string): Scatter; };
-    pointSize: { (): number; (_: number): Scatter; };
-    interpolate: { (): string; (_: string): Scatter; };
-    interpolate_default: { (): string; (_: string): Scatter; };
-    interpolateFill: { (): boolean; (_: boolean): Scatter; };
-    interpolateFill_default: { (): boolean; (_: boolean): Scatter; };
-    interpolateFillOpacity: { (): number; (_: number): Scatter; };
-
-    //  INDChart
-    fillColor: (row, column, value, origRow) => string;
-    strokeColor: (row, column, value, origRow) => string;
-    textColor: (row, column, value, origRow) => string;
-    dblclick: (row, column, selected) => void;
-
-    //  ITooltip
-    tooltip;
-    tooltipHTML: (_) => string;
-    tooltipFormat: (_) => string;
-    tooltipStyle: () => "default" | "none" | "series-table";
 }
 Scatter.prototype._class += " chart_Scatter";
 Scatter.prototype.implements(INDChart.prototype);
 Scatter.prototype.implements(ITooltip.prototype);
+
 export interface Scatter {
+
     valueAnchor(): string;
     valueAnchor(_: string): this;
     valueBaseline(): string;
@@ -359,6 +338,39 @@ export interface Scatter {
     pointDarken(_: boolean): this;
     interpolateDarken(): boolean;
     interpolateDarken(_: boolean): this;
+
+    paletteID(): string;
+    paletteID(_: string): this;
+    useClonedPalette(): boolean;
+    useClonedPalette(_: boolean): this;
+    pointSizeScale(): string;
+    pointSizeScale(_: string): this;
+    pointShape(): string;
+    pointShape(_: string): this;
+    pointSize(): number;
+    pointSize(_: number): this;
+    interpolate(): string;
+    interpolate(_: string): this;
+    interpolate_default(): string;
+    interpolate_default(_: string): this;
+    interpolateFill(): boolean;
+    interpolateFill(_: boolean): this;
+    interpolateFill_default(): boolean;
+    interpolateFill_default(_: boolean): this;
+    interpolateFillOpacity(): number;
+    interpolateFillOpacity(_: number): this;
+
+    //  INDChart
+    fillColor(row, column, value, origRow): string;
+    strokeColor(row, column, value, origRow): string;
+    textColor(row, column, value, origRow): string;
+    dblclick(row, column, selected): void;
+
+    //  ITooltip
+    tooltip;
+    tooltipHTML(_): string;
+    tooltipFormat(_): string;
+    tooltipStyle(): "default" | "none" | "series-table";
 }
 Scatter.prototype.publish("paletteID", "default", "set", "Color palette for this widget", Scatter.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
 Scatter.prototype.publish("pointSizeScale", "linear", "set", "pointSizeScale", ["linear", "pow", "log", "sqrt"]);

package/src/StatChart.ts

@@ -221,8 +221,16 @@ export class StatChart extends HTMLWidget {
         this.updateScatter();
         this.updateCandle();
     }
+
+    exit(domNode, element) {
+        this._bellCurve.target(null);
+        this._candle.target(null);
+        this._selectElement.remove();
+
+        super.exit(domNode, element);
+    }
 }
-StatChart.prototype._class += " chart_Stat";
+StatChart.prototype._class += " chart_StatChart";
 
 export interface StatChart {
     view(): StatChartView;