diff --git a/.eslintrc.js b/.eslintrc.cjs
similarity index 100%
rename from .eslintrc.js
rename to .eslintrc.cjs
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index c8a3ab5103..e94ee74f22 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -21,7 +21,7 @@ jobs:
steps:
- name: Initialize Release Please
id: release
- if: ${{ github.event_name == 'push' }}
+ if: ${{ github.event_name == 'push' }}
uses: googleapis/release-please-action@v4
with:
target-branch: ${{ github.ref_name }}
diff --git a/.vitepress/config.ts b/.vitepress/config.ts
index 252e3eccf1..1030c78b9a 100644
--- a/.vitepress/config.ts
+++ b/.vitepress/config.ts
@@ -1,287 +1,47 @@
-import { ApiClass, ApiItem, ApiModel, ApiProperty } from "@microsoft/api-extractor-model";
-import path from "path";
-import { IndentedWriter, writeApiItem } from "./mdWriter";
-
-function getGuideSidebar() {
- return [
- {
- text: "Introduction",
- children: [
- { text: "Getting Started", link: "/README" }
- ]
+import { defineConfig } from "vitepress";
+import { observable } from "@hpcc-js/markdown-it-plugins";
+import { eclLang } from "@hpcc-js/markdown-it-plugins/ecl-lang";
+
+// https://vitepress.dev/reference/site-config
+export default async () => {
+
+ return defineConfig({
+ title: "@hpcc-js/Visualization",
+ description: "HPCC Systems JavaScript Library",
+ base: "/Visualization/",
+ srcDir: ".",
+ rewrites: {
},
- {
- text: "Advanced",
- children: [{ text: "API Reference", link: "/docs/api/hpcc-js" }]
- }
- ];
-}
-
-// Keep in sync with: ../components/README.md
-
-function getComponentsSidebar() {
- return [
- {
- text: "Editors",
- children: [
- { text: "CodeMirror", link: "/components/editor/src/codemirror" },
- { text: "Preview", link: "/components/preview/src/preview" },
- ]
- }, {
- text: "Observable HQ",
- children: [
- { text: "Getting Started", link: "/components/observable/README" },
- { text: "Observable Script", link: "/components/observable/src/observable" },
- ]
- }, {
- text: "Layouts",
- children: [
- { text: "Getting Started", link: "/components/layout/README" },
- { text: "Dock Panel", link: "/components/layout/src/lumino/dockPanel" },
- { text: "Drag and Zoom", link: "/components/layout/src/zoom" },
- { text: "Split Panel", link: "/components/layout/src/lumino/splitPanel" },
- { text: "Tab Panel", link: "/components/layout/src/lumino/tabPanel" },
- ]
- }//, {
- // text: "Visualizations",
- // children: [
- // { text: "Gauge", link: "/components/gauge/src/gauge" },
- // { text: "Half Pie", link: "/components/pie/src/halfpie" },
- // { text: "Observable JS", link: "/components/observable/src/observable" },
- // { text: "Pie", link: "/components/pie/src/pie" },
- // { text: "Quarter Pie", link: "/components/pie/src/quarterpie" },
- // { text: "Sankey", link: "/components/sankey/src/sankey" },
- // { text: "Treemap", link: "/components/treemap/src/treemap" },
- // ]
- // }
- ];
-}
-
-function getVisualizationsSidebar() {
- return [
- {
- text: "Charts",
- children: [
- { text: "Getting Started", link: "/packages/chart/README" },
- { text: "Area", link: "/packages/chart/src/Area" },
- { text: "Bar", link: "/packages/chart/src/Bar" },
- { text: "Bubble", link: "/packages/chart/src/Bubble" },
- { text: "Bullet", link: "/packages/chart/src/Bullet" },
- { text: "Column", link: "/packages/chart/src/Column" },
- { text: "Contour", link: "/packages/chart/src/Contour" },
- { text: "Gantt", link: "/packages/chart/src/Gantt" },
- { text: "Gauge", link: "/packages/chart/src/Gauge" },
- { text: "Half Pie", link: "/packages/chart/src/HalfPie" },
- { text: "Heat", link: "/packages/chart/src/Heat" },
- { text: "Hex Bin", link: "/packages/chart/src/HexBin" },
- { text: "Line", link: "/packages/chart/src/Line" },
- { text: "Pie", link: "/packages/chart/src/Pie" },
- { text: "Quarter Pie", link: "/packages/chart/src/QuarterPie" },
- { text: "Quartile Candlestick", link: "/packages/chart/src/QuartileCandlestick" },
- { text: "Radar", link: "/packages/chart/src/Radar" },
- { text: "Radial Bar", link: "/packages/chart/src/RadialBar" },
- { text: "Scatter", link: "/packages/chart/src/Scatter" },
- { text: "Stat Chart", link: "/packages/chart/src/StatChart" },
- { text: "Step", link: "/packages/chart/src/Step" },
- { text: "Summary", link: "/packages/chart/src/Summary" },
- { text: "Summary (Canvas)", link: "/packages/chart/src/SummaryC" },
- { text: "Word Cloud", link: "/packages/chart/src/WordCloud" },
- { text: "XYAxis", link: "/packages/chart/src/XYAxis" },
- ]
- }, {
- text: "Editors",
- children: [
- { text: "Getting Started", link: "/packages/codemirror/README" },
- ]
- }, {
- text: "Grids",
- children: [
- { text: "Getting Started", link: "/packages/dgrid2/README" },
- { text: "Table", link: "/packages/dgrid2/src/table" },
- ]
- }, {
- text: "Graphs",
- children: [
- { text: "Getting Started", link: "/packages/graph/README" },
- ]
- }, {
- text: "Layouts",
- children: [
- { text: "Getting Started", link: "/packages/layout/README" },
- ]
- }, {
- text: "Geospatial 2D",
- children: [
- { text: "Getting Started", link: "/packages/map/README" },
- ]
- }, {
- text: "Geospatial 3D",
- children: [
- { text: "Getting Started", link: "/packages/map-deck/README" },
- ]
- }, {
- text: "Observable HQ",
- children: [
- { text: "Getting Started", link: "/packages/observablehq-compiler/README" },
- { text: "Compiler", link: "/packages/observablehq-compiler/src/compiler" },
- { text: "Utilities", link: "/packages/observablehq-compiler/src/util" },
- ]
- }, {
- text: "Timelines",
- children: [
- { text: "Getting Started", link: "/packages/timeline/README" },
- ]
- }, {
- text: "Hierarchy",
- children: [
- { text: "Getting Started", link: "/packages/tree/README" },
- ]
- }
- ];
-}
-
-module.exports = {
- lang: "en-US",
- title: "@hpcc-js/Visualization",
- description: "HPCC Systems JavaScript Library",
- base: "/Visualization/",
-
- head: [
- ['link', { rel: 'icon', type: 'image/x-icon', href: '/Visualization/resources/favicon.ico' }],
- ],
+ lastUpdated: true,
+ themeConfig: {
+ // https://vitepress.dev/reference/default-theme-config
+ nav: [
+ { text: "Home", link: "/" },
+ { text: "Getting Started", link: "/README" },
+ ],
+
+ sidebar: [
+ { text: "Getting Started", link: "/README" },
+ {
+ text: "Documentation",
+ items: [
+ ]
+ }
+ ],
- themeConfig: {
- repo: "hpcc-systems/Visualization",
- docsDir: "",
- docsBranch: "trunk",
- editLinks: true,
- editLinkText: "Edit this page on GitHub",
- lastUpdated: "Last Updated",
+ socialLinks: [
+ { icon: "github", link: "https://github.com/hpcc-systems/visualization" }
+ ],
- nav: [
- {
- text: "Guide",
- link: "/README",
- activeMatch: "^/README"
- },
- {
- text: "Web Components",
- link: "/components/README",
- activeMatch: "^/components/"
- },
- {
- text: "Visualizations",
- link: "/packages/README",
- activeMatch: "^/packages/"
+ },
+ markdown: {
+ // https://github.com/vuejs/vitepress/blob/main/src/node/markdown/markdown.ts
+ config: md => {
+ md.use(observable, { vitePress: true });
},
- {
- text: "Release Notes",
- link: "https://github.com/hpcc-systems/Visualization/releases"
- }
- ],
- sidebar: {
- "/README": getGuideSidebar(),
- "/components": getComponentsSidebar(),
- "/packages": getVisualizationsSidebar()
+ languages: [eclLang()],
}
- },
- vue: {
- template: {
- compilerOptions: {
- isCustomElement: (tag) => {
- return tag.toLowerCase().indexOf("hpcc-") === 0;
- }
- }
- }
- },
-
- markdown: {
- config: (md) => {
- const structs: { [id: string]: ApiItem } = {};
- const props: { [id: string]: ApiItem } = {};
-
- let allMeta = {};
- try {
- allMeta = require(path.join(__dirname, "../temp/hpcc-js.meta.json"));
- } catch (e) {
- // File might not exit yet ---
- }
-
- function writeAttributes(struct: ApiItem, writer: IndentedWriter, isAttribute: boolean = true): boolean {
- let retVal = false;
- const structClass = struct as ApiClass;
- // writer.writeLine(struct.displayName);
- const baseClass = structs[structClass.extendsType?.excerpt?.text?.trim()];
- if (baseClass) {
- retVal = writeAttributes(baseClass, writer, isAttribute);
- }
- const classMeta = allMeta[struct.displayName] ?? { observed: {} };
- for (const prop of struct.members) {
- const propMeta = classMeta.observed[prop.displayName];
- if ((prop as ApiProperty).tsdocComment) {
- if (propMeta === undefined || propMeta.isAttribute === isAttribute) {
- if (writeApiItem(prop, { writer }, false)) {
- retVal = true;
- }
- }
- }
- }
- return retVal;
- }
-
- md.core.ruler.before("normalize", "types", function replace(state) {
- const apiModel = new ApiModel();
- let apiPackage;
- try {
- apiPackage = apiModel.loadPackage("./temp/hpcc-js.api.json");
- } catch (e) {
- // File might not exit yet ---
- }
-
- apiPackage?.members.forEach(entyrPoint => {
- for (const struct of entyrPoint.members) {
- // if (struct.displayName.indexOf("HPCC") === 0 && struct.displayName.indexOf("Element") > 0) {
- structs[struct.displayName] = struct;
- for (const prop of struct.members) {
- props[struct.displayName + "." + prop.displayName] = prop;
- }
- // }
- }
- });
-
- for (const key in structs) {
- const struct = structs[key];
- const search = `## \`${key}\``;
- if (state.src.indexOf(search) >= 0) {
- let replacement = "";
- const attrWriter = new IndentedWriter();
- attrWriter.writeLine(`## Attributes`);
- attrWriter.writeLine();
- if (writeAttributes(struct, attrWriter, true)) {
- replacement += attrWriter.toString();
- }
- const propWriter = new IndentedWriter();
- propWriter.writeLine(`## Properties`);
- propWriter.writeLine();
- if (writeAttributes(struct, propWriter, false)) {
- replacement += propWriter.toString();
- }
- state.src = state.src.split(search).join(replacement);
- }
- }
-
- for (const key in props) {
- const search = `### \`${key}\``;
- if (state.src.indexOf(search) >= 0) {
- const prop = props[key];
- const writer = new IndentedWriter();
- writeApiItem(prop, { writer }, false);
- state.src = state.src.split(search).join(writer.toString());
- }
- }
- });
- }
- }
+ });
};
diff --git a/.vitepress/theme/index.ts b/.vitepress/theme/index.ts
index 390af7bf08..caa4ebe942 100644
--- a/.vitepress/theme/index.ts
+++ b/.vitepress/theme/index.ts
@@ -1,22 +1,19 @@
-//@ts-ignore
+// https://vitepress.dev/guide/custom-theme
+import { h } from "vue";
+import type { Theme } from "vitepress";
import DefaultTheme from "vitepress/theme";
-
-//@ts-ignore
-if (import.meta.env.MODE === "development") {
- import("../../src/index");
-}
+import RenderComponent from "@hpcc-js/markdown-it-plugins/vitepress/RenderComponent.vue";
+import "@hpcc-js/markdown-it-plugins/vitepress/styles.ts";
export default {
- ...DefaultTheme,
+ extends: DefaultTheme,
+ Layout: () => {
+ return h(DefaultTheme.Layout, null, {
+ // https://vitepress.dev/guide/extending-default-theme#layout-slots
+ });
+ },
enhanceApp({ app }) {
+ app.component("RenderComponent", RenderComponent);
},
- vueOptions: {
- template: {
- compilerOptions: {
- isCustomElement: (tag) => {
- return tag.toLowerCase().indexOf("hpcc-") === 0;
- }
- }
- }
- }
-};
+
+} satisfies Theme;
diff --git a/.vitepress_v2/config.ts b/.vitepress_v2/config.ts
new file mode 100644
index 0000000000..252e3eccf1
--- /dev/null
+++ b/.vitepress_v2/config.ts
@@ -0,0 +1,287 @@
+import { ApiClass, ApiItem, ApiModel, ApiProperty } from "@microsoft/api-extractor-model";
+import path from "path";
+import { IndentedWriter, writeApiItem } from "./mdWriter";
+
+function getGuideSidebar() {
+ return [
+ {
+ text: "Introduction",
+ children: [
+ { text: "Getting Started", link: "/README" }
+ ]
+ },
+ {
+ text: "Advanced",
+ children: [{ text: "API Reference", link: "/docs/api/hpcc-js" }]
+ }
+ ];
+}
+
+// Keep in sync with: ../components/README.md
+
+function getComponentsSidebar() {
+ return [
+ {
+ text: "Editors",
+ children: [
+ { text: "CodeMirror", link: "/components/editor/src/codemirror" },
+ { text: "Preview", link: "/components/preview/src/preview" },
+ ]
+ }, {
+ text: "Observable HQ",
+ children: [
+ { text: "Getting Started", link: "/components/observable/README" },
+ { text: "Observable Script", link: "/components/observable/src/observable" },
+ ]
+ }, {
+ text: "Layouts",
+ children: [
+ { text: "Getting Started", link: "/components/layout/README" },
+ { text: "Dock Panel", link: "/components/layout/src/lumino/dockPanel" },
+ { text: "Drag and Zoom", link: "/components/layout/src/zoom" },
+ { text: "Split Panel", link: "/components/layout/src/lumino/splitPanel" },
+ { text: "Tab Panel", link: "/components/layout/src/lumino/tabPanel" },
+ ]
+ }//, {
+ // text: "Visualizations",
+ // children: [
+ // { text: "Gauge", link: "/components/gauge/src/gauge" },
+ // { text: "Half Pie", link: "/components/pie/src/halfpie" },
+ // { text: "Observable JS", link: "/components/observable/src/observable" },
+ // { text: "Pie", link: "/components/pie/src/pie" },
+ // { text: "Quarter Pie", link: "/components/pie/src/quarterpie" },
+ // { text: "Sankey", link: "/components/sankey/src/sankey" },
+ // { text: "Treemap", link: "/components/treemap/src/treemap" },
+ // ]
+ // }
+ ];
+}
+
+function getVisualizationsSidebar() {
+ return [
+ {
+ text: "Charts",
+ children: [
+ { text: "Getting Started", link: "/packages/chart/README" },
+ { text: "Area", link: "/packages/chart/src/Area" },
+ { text: "Bar", link: "/packages/chart/src/Bar" },
+ { text: "Bubble", link: "/packages/chart/src/Bubble" },
+ { text: "Bullet", link: "/packages/chart/src/Bullet" },
+ { text: "Column", link: "/packages/chart/src/Column" },
+ { text: "Contour", link: "/packages/chart/src/Contour" },
+ { text: "Gantt", link: "/packages/chart/src/Gantt" },
+ { text: "Gauge", link: "/packages/chart/src/Gauge" },
+ { text: "Half Pie", link: "/packages/chart/src/HalfPie" },
+ { text: "Heat", link: "/packages/chart/src/Heat" },
+ { text: "Hex Bin", link: "/packages/chart/src/HexBin" },
+ { text: "Line", link: "/packages/chart/src/Line" },
+ { text: "Pie", link: "/packages/chart/src/Pie" },
+ { text: "Quarter Pie", link: "/packages/chart/src/QuarterPie" },
+ { text: "Quartile Candlestick", link: "/packages/chart/src/QuartileCandlestick" },
+ { text: "Radar", link: "/packages/chart/src/Radar" },
+ { text: "Radial Bar", link: "/packages/chart/src/RadialBar" },
+ { text: "Scatter", link: "/packages/chart/src/Scatter" },
+ { text: "Stat Chart", link: "/packages/chart/src/StatChart" },
+ { text: "Step", link: "/packages/chart/src/Step" },
+ { text: "Summary", link: "/packages/chart/src/Summary" },
+ { text: "Summary (Canvas)", link: "/packages/chart/src/SummaryC" },
+ { text: "Word Cloud", link: "/packages/chart/src/WordCloud" },
+ { text: "XYAxis", link: "/packages/chart/src/XYAxis" },
+ ]
+ }, {
+ text: "Editors",
+ children: [
+ { text: "Getting Started", link: "/packages/codemirror/README" },
+ ]
+ }, {
+ text: "Grids",
+ children: [
+ { text: "Getting Started", link: "/packages/dgrid2/README" },
+ { text: "Table", link: "/packages/dgrid2/src/table" },
+ ]
+ }, {
+ text: "Graphs",
+ children: [
+ { text: "Getting Started", link: "/packages/graph/README" },
+ ]
+ }, {
+ text: "Layouts",
+ children: [
+ { text: "Getting Started", link: "/packages/layout/README" },
+ ]
+ }, {
+ text: "Geospatial 2D",
+ children: [
+ { text: "Getting Started", link: "/packages/map/README" },
+ ]
+ }, {
+ text: "Geospatial 3D",
+ children: [
+ { text: "Getting Started", link: "/packages/map-deck/README" },
+ ]
+ }, {
+ text: "Observable HQ",
+ children: [
+ { text: "Getting Started", link: "/packages/observablehq-compiler/README" },
+ { text: "Compiler", link: "/packages/observablehq-compiler/src/compiler" },
+ { text: "Utilities", link: "/packages/observablehq-compiler/src/util" },
+ ]
+ }, {
+ text: "Timelines",
+ children: [
+ { text: "Getting Started", link: "/packages/timeline/README" },
+ ]
+ }, {
+ text: "Hierarchy",
+ children: [
+ { text: "Getting Started", link: "/packages/tree/README" },
+ ]
+ }
+ ];
+}
+
+module.exports = {
+ lang: "en-US",
+ title: "@hpcc-js/Visualization",
+ description: "HPCC Systems JavaScript Library",
+ base: "/Visualization/",
+
+ head: [
+ ['link', { rel: 'icon', type: 'image/x-icon', href: '/Visualization/resources/favicon.ico' }],
+ ],
+
+ themeConfig: {
+ repo: "hpcc-systems/Visualization",
+ docsDir: "",
+ docsBranch: "trunk",
+ editLinks: true,
+ editLinkText: "Edit this page on GitHub",
+ lastUpdated: "Last Updated",
+
+ nav: [
+ {
+ text: "Guide",
+ link: "/README",
+ activeMatch: "^/README"
+ },
+ {
+ text: "Web Components",
+ link: "/components/README",
+ activeMatch: "^/components/"
+ },
+ {
+ text: "Visualizations",
+ link: "/packages/README",
+ activeMatch: "^/packages/"
+ },
+ {
+ text: "Release Notes",
+ link: "https://github.com/hpcc-systems/Visualization/releases"
+ }
+ ],
+
+ sidebar: {
+ "/README": getGuideSidebar(),
+ "/components": getComponentsSidebar(),
+ "/packages": getVisualizationsSidebar()
+ }
+ },
+
+ vue: {
+ template: {
+ compilerOptions: {
+ isCustomElement: (tag) => {
+ return tag.toLowerCase().indexOf("hpcc-") === 0;
+ }
+ }
+ }
+ },
+
+ markdown: {
+ config: (md) => {
+ const structs: { [id: string]: ApiItem } = {};
+ const props: { [id: string]: ApiItem } = {};
+
+ let allMeta = {};
+ try {
+ allMeta = require(path.join(__dirname, "../temp/hpcc-js.meta.json"));
+ } catch (e) {
+ // File might not exit yet ---
+ }
+
+ function writeAttributes(struct: ApiItem, writer: IndentedWriter, isAttribute: boolean = true): boolean {
+ let retVal = false;
+ const structClass = struct as ApiClass;
+ // writer.writeLine(struct.displayName);
+ const baseClass = structs[structClass.extendsType?.excerpt?.text?.trim()];
+ if (baseClass) {
+ retVal = writeAttributes(baseClass, writer, isAttribute);
+ }
+ const classMeta = allMeta[struct.displayName] ?? { observed: {} };
+ for (const prop of struct.members) {
+ const propMeta = classMeta.observed[prop.displayName];
+ if ((prop as ApiProperty).tsdocComment) {
+ if (propMeta === undefined || propMeta.isAttribute === isAttribute) {
+ if (writeApiItem(prop, { writer }, false)) {
+ retVal = true;
+ }
+ }
+ }
+ }
+ return retVal;
+ }
+
+ md.core.ruler.before("normalize", "types", function replace(state) {
+ const apiModel = new ApiModel();
+ let apiPackage;
+ try {
+ apiPackage = apiModel.loadPackage("./temp/hpcc-js.api.json");
+ } catch (e) {
+ // File might not exit yet ---
+ }
+
+ apiPackage?.members.forEach(entyrPoint => {
+ for (const struct of entyrPoint.members) {
+ // if (struct.displayName.indexOf("HPCC") === 0 && struct.displayName.indexOf("Element") > 0) {
+ structs[struct.displayName] = struct;
+ for (const prop of struct.members) {
+ props[struct.displayName + "." + prop.displayName] = prop;
+ }
+ // }
+ }
+ });
+
+ for (const key in structs) {
+ const struct = structs[key];
+ const search = `## \`${key}\``;
+ if (state.src.indexOf(search) >= 0) {
+ let replacement = "";
+ const attrWriter = new IndentedWriter();
+ attrWriter.writeLine(`## Attributes`);
+ attrWriter.writeLine();
+ if (writeAttributes(struct, attrWriter, true)) {
+ replacement += attrWriter.toString();
+ }
+ const propWriter = new IndentedWriter();
+ propWriter.writeLine(`## Properties`);
+ propWriter.writeLine();
+ if (writeAttributes(struct, propWriter, false)) {
+ replacement += propWriter.toString();
+ }
+ state.src = state.src.split(search).join(replacement);
+ }
+ }
+
+ for (const key in props) {
+ const search = `### \`${key}\``;
+ if (state.src.indexOf(search) >= 0) {
+ const prop = props[key];
+ const writer = new IndentedWriter();
+ writeApiItem(prop, { writer }, false);
+ state.src = state.src.split(search).join(writer.toString());
+ }
+ }
+ });
+ }
+ }
+};
diff --git a/.vitepress/mdWriter.ts b/.vitepress_v2/mdWriter.ts
similarity index 100%
rename from .vitepress/mdWriter.ts
rename to .vitepress_v2/mdWriter.ts
diff --git a/.vitepress_v2/theme/index.ts b/.vitepress_v2/theme/index.ts
new file mode 100644
index 0000000000..390af7bf08
--- /dev/null
+++ b/.vitepress_v2/theme/index.ts
@@ -0,0 +1,22 @@
+//@ts-ignore
+import DefaultTheme from "vitepress/theme";
+
+//@ts-ignore
+if (import.meta.env.MODE === "development") {
+ import("../../src/index");
+}
+
+export default {
+ ...DefaultTheme,
+ enhanceApp({ app }) {
+ },
+ vueOptions: {
+ template: {
+ compilerOptions: {
+ isCustomElement: (tag) => {
+ return tag.toLowerCase().indexOf("hpcc-") === 0;
+ }
+ }
+ }
+ }
+};
diff --git a/index.html b/index.html
deleted file mode 100644
index cf776d1111..0000000000
--- a/index.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
- hpcc-js
- ');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Stacked:
-
- Bar:
-
- Percentage:
-
-
-
-
-
+
+
+
- function doStacked(stacked) {
- if (app) {
- app
- .yAxisStacked(stacked)
- .lazyRender();
- }
- }
+
+ ESM Quick Test
+
+
+
diff --git a/packages/chart/package.json b/packages/chart/package.json
index 01bfe917b6..9fc409613b 100644
--- a/packages/chart/package.json
+++ b/packages/chart/package.json
@@ -32,7 +32,8 @@
"test-browser": "vitest run --project browser",
"test": "vitest run",
"coverage": "vitest run --coverage",
- "update": "npx -y npm-check-updates -u -t minor"
+ "update": "npx -y npm-check-updates -u -t minor",
+ "update-major": "npx -y npm-check-updates -u"
},
"dependencies": {
"@hpcc-js/api": "^3.1.0",
@@ -41,7 +42,6 @@
},
"devDependencies": {
"@hpcc-js/esbuild-plugins": "^1.2.0",
- "@hpcc-js/dataflow": "^9.1.0",
"@types/d3-shape": "1.3.12",
"@types/d3-transition": "1.3.6",
"d3-array": "^1",
diff --git a/packages/chart/src/Axis.ts b/packages/chart/src/Axis.ts
index b851a5df7f..a39d0cfafa 100644
--- a/packages/chart/src/Axis.ts
+++ b/packages/chart/src/Axis.ts
@@ -113,14 +113,14 @@ export class Axis extends SVGWidget {
return true;
}
- domain(_) {
- if (!arguments.length) return this.d3Scale.domain();
+ domain(_?) {
+ if (_ === undefined) return this.d3Scale.domain();
this.d3Scale.domain(_);
return this;
}
- range(_) {
- if (!arguments.length) {
+ range(_?) {
+ if (_ === undefined) {
if (this.d3Scale.rangeRoundBands) {
return this.d3Scale.rangeExtent();
} else if (this.d3Scale.rangeRound) {
@@ -745,8 +745,8 @@ 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) {
+ const retVal = Axis.prototype._origType.call(this, _);
+ if (_ !== undefined) {
this._type = _;
this.updateScale();
}
@@ -755,8 +755,8 @@ 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) {
+ const retVal = Axis.prototype._origTimePattern.call(this, _);
+ if (_ !== undefined) {
this._timePattern = _;
this.updateScale();
}
diff --git a/packages/chart/src/Bubble.ts b/packages/chart/src/Bubble.ts
index 1fc3f1ee0d..636e3eb7c6 100644
--- a/packages/chart/src/Bubble.ts
+++ b/packages/chart/src/Bubble.ts
@@ -36,8 +36,8 @@ export class Bubble extends SVGWidget {
size(): ISize;
size(_): this;
size(_?): ISize | this {
- const retVal = super.size.apply(this, arguments);
- if (arguments.length) {
+ const retVal = super.size(_);
+ if (_ !== undefined) {
this.d3Pack
.size([this.width(), this.height()])
;
@@ -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"] });
diff --git a/packages/chart/src/Column.ts b/packages/chart/src/Column.ts
index e2c5ccae2d..db8d6cf35c 100644
--- a/packages/chart/src/Column.ts
+++ b/packages/chart/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 });
diff --git a/packages/chart/src/D3Cloud.ts b/packages/chart/src/D3Cloud.ts
index b325e29e92..8f24c8b7cf 100644
--- a/packages/chart/src/D3Cloud.ts
+++ b/packages/chart/src/D3Cloud.ts
@@ -26,8 +26,8 @@ export function d3Cloud() {
let random = Math.random;
let canvas = cloudCanvas;
- cloud.canvas = function (_) {
- return arguments.length ? (canvas = functor(_), cloud) : canvas;
+ cloud.canvas = function (_?) {
+ return _ !== undefined ? (canvas = functor(_), cloud) : canvas;
};
cloud.start = function () {
@@ -149,52 +149,52 @@ export function d3Cloud() {
return false;
}
- cloud.timeInterval = function (_) {
- return arguments.length ? (timeInterval = _ == null ? Infinity : _, cloud) : timeInterval;
+ cloud.timeInterval = function (_?) {
+ return _ !== undefined ? (timeInterval = _ == null ? Infinity : _, cloud) : timeInterval;
};
- cloud.words = function (_) {
- return arguments.length ? (words = _, cloud) : words;
+ cloud.words = function (_?) {
+ return _ !== undefined ? (words = _, cloud) : words;
};
- cloud.size = function (_) {
- return arguments.length ? (size = [+_[0], +_[1]], cloud) : size;
+ cloud.size = function (_?) {
+ return _ !== undefined ? (size = [+_[0], +_[1]], cloud) : size;
};
- cloud.font = function (_) {
- return arguments.length ? (font = functor(_), cloud) : font;
+ cloud.font = function (_?) {
+ return _ !== undefined ? (font = functor(_), cloud) : font;
};
- cloud.fontStyle = function (_) {
- return arguments.length ? (fontStyle = functor(_), cloud) : fontStyle;
+ cloud.fontStyle = function (_?) {
+ return _ !== undefined ? (fontStyle = functor(_), cloud) : fontStyle;
};
- cloud.fontWeight = function (_) {
- return arguments.length ? (fontWeight = functor(_), cloud) : fontWeight;
+ cloud.fontWeight = function (_?) {
+ return _ !== undefined ? (fontWeight = functor(_), cloud) : fontWeight;
};
- cloud.rotate = function (_) {
- return arguments.length ? (rotate = functor(_), cloud) : rotate;
+ cloud.rotate = function (_?) {
+ return _ !== undefined ? (rotate = functor(_), cloud) : rotate;
};
- cloud.text = function (_) {
- return arguments.length ? (text = functor(_), cloud) : text;
+ cloud.text = function (_?) {
+ return _ !== undefined ? (text = functor(_), cloud) : text;
};
- cloud.spiral = function (_) {
- return arguments.length ? (spiral = spirals[_] || _, cloud) : spiral;
+ cloud.spiral = function (_?) {
+ return _ !== undefined ? (spiral = spirals[_] || _, cloud) : spiral;
};
- cloud.fontSize = function (_) {
- return arguments.length ? (fontSize = functor(_), cloud) : fontSize;
+ cloud.fontSize = function (_?) {
+ return _ !== undefined ? (fontSize = functor(_), cloud) : fontSize;
};
- cloud.padding = function (_) {
- return arguments.length ? (padding = functor(_), cloud) : padding;
+ cloud.padding = function (_?) {
+ return _ !== undefined ? (padding = functor(_), cloud) : padding;
};
- cloud.random = function (_) {
- return arguments.length ? (random = _, cloud) : random;
+ cloud.random = function (_?) {
+ return _ !== undefined ? (random = _, cloud) : random;
};
cloud.on = function () {
diff --git a/packages/chart/src/HexBin.ts b/packages/chart/src/HexBin.ts
index 1269c4c1a8..2c069ff037 100644
--- a/packages/chart/src/HexBin.ts
+++ b/packages/chart/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"] });
diff --git a/packages/chart/src/Pie.ts b/packages/chart/src/Pie.ts
index 72abb4fb6a..5188d9f6b2 100644
--- a/packages/chart/src/Pie.ts
+++ b/packages/chart/src/Pie.ts
@@ -119,7 +119,7 @@ export class Pie extends SVGWidget {
selection(): any[]; // any[] === single row
selection(_: any[]): this;
selection(_?: any[]): any[] | this {
- if (!arguments.length) {
+ if (_ === undefined) {
try {
return this._selection.selection2()[0]?.data;
} catch (e) {
@@ -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() });
diff --git a/packages/chart/src/Radar.ts b/packages/chart/src/Radar.ts
index 9f824b6a08..81b549bb8a 100644
--- a/packages/chart/src/Radar.ts
+++ b/packages/chart/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());
diff --git a/packages/chart/src/RadialBar.ts b/packages/chart/src/RadialBar.ts
index 0e998784a2..69e78e8640 100644
--- a/packages/chart/src/RadialBar.ts
+++ b/packages/chart/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)");
diff --git a/packages/chart/src/Scatter.ts b/packages/chart/src/Scatter.ts
index 5ad1d3a70c..9984a2c3fc 100644
--- a/packages/chart/src/Scatter.ts
+++ b/packages/chart/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"]);
diff --git a/packages/chart/src/StatChart.ts b/packages/chart/src/StatChart.ts
index d676d12195..067eae5f38 100644
--- a/packages/chart/src/StatChart.ts
+++ b/packages/chart/src/StatChart.ts
@@ -106,7 +106,7 @@ export class StatChart extends HTMLWidget {
data(): Data;
data(_: Data): this;
data(_?: Data): Data | this {
- if (!arguments.length) return [[...this.quartiles(), this.mean(), this.standardDeviation()]];
+ if (_ === undefined) return [[...this.quartiles(), this.mean(), this.standardDeviation()]];
const row = _[0];
this.quartiles([row[0], row[1], row[2], row[3], row[4]]);
this.mean(row[5]);
@@ -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;
diff --git a/packages/chart/src/Summary.ts b/packages/chart/src/Summary.ts
index 22208e0546..385fb2b39f 100644
--- a/packages/chart/src/Summary.ts
+++ b/packages/chart/src/Summary.ts
@@ -303,8 +303,8 @@ Summary.prototype.publish("playInterval", null, "number", "Play Interval", null,
const playInterval = Summary.prototype.playInterval;
Summary.prototype.playInterval = function (_?: number): number | any {
- const retVal = playInterval.apply(this, arguments);
- if (arguments.length) {
+ const retVal = playInterval.call(this, _);
+ if (_ === undefined) {
if (this._playIntervalHandle) {
clearInterval(this._playIntervalHandle);
}
diff --git a/packages/chart/src/SummaryC.ts b/packages/chart/src/SummaryC.ts
index edcac02f26..4fbbfd2c4c 100644
--- a/packages/chart/src/SummaryC.ts
+++ b/packages/chart/src/SummaryC.ts
@@ -221,8 +221,8 @@ SummaryC.prototype.publish("iconSizeRatio", 0.9, "number", "Ratio of the height
const playInterval = SummaryC.prototype.playInterval;
SummaryC.prototype.playInterval = function (_?: number): number | any {
- const retVal = playInterval.apply(this, arguments);
- if (arguments.length) {
+ const retVal = playInterval.call(this, _);
+ if (_ !== undefined) {
if (this._playIntervalHandle) {
clearInterval(this._playIntervalHandle);
}
diff --git a/packages/chart/src/WordCloud.ts b/packages/chart/src/WordCloud.ts
index ba52147e2d..fc3e1bb6a3 100644
--- a/packages/chart/src/WordCloud.ts
+++ b/packages/chart/src/WordCloud.ts
@@ -184,7 +184,14 @@ export class WordCloud extends SVGWidget {
this._prevZoom = scale;
}
}
+}
+WordCloud.prototype._class += " chart_WordCloud";
+WordCloud.prototype.implements(I2DChart.prototype);
+WordCloud.prototype.implements(ITooltip.prototype);
+WordCloud.prototype.mixin(Utility.SimpleSelectionMixin);
+export interface WordCloud {
+ /*
paletteID: { (): string; (_: string): WordCloud };
paletteID_exists: () => boolean;
useClonedPalette: { (): boolean; (_: boolean): WordCloud };
@@ -238,13 +245,68 @@ export class WordCloud extends SVGWidget {
tooltipOffset: { (): number; (_: number): WordCloud };
tooltipOffset_exists: () => boolean;
+ // SimpleSelectionMixin
+ _selection: Utility.SimpleSelection;
+ */
+
+ paletteID(): string;
+ paletteID(_: string): this;
+ useClonedPalette(): boolean;
+ useClonedPalette(_: boolean): this;
+ fontFamily(): string;
+ fontFamily(_: string): this;
+ fontSizeFrom(): number;
+ fontSizeFrom(_: number): this;
+ fontSizeTo(): number;
+ fontSizeTo(_: number): this;
+ angleFrom(): number;
+ angleFrom(_: number): this;
+ angleTo(): number;
+ angleTo(_: number): this;
+ angleCount(): number;
+ angleCount(_: number): this;
+ padding(): number;
+ padding(_: number): this;
+ scaleMode(): string;
+ scaleMode(_: string): this;
+ spiral(): string;
+ spiral(_: string): this;
+ offsetX(): number;
+ offsetX(_: number): this;
+ offsetY(): number;
+ offsetY(_: number): this;
+ zoom(): number;
+ zoom(_: number): this;
+ zoom_exists(): boolean;
+
+ // I2DChart
+ _palette;
+ click(row, column, selected): void;
+ dblclick(row, column, selected): void;
+
+ // ITooltip ---
+ tooltip;
+ tooltipHTML(_?): any;
+ tooltipFormat(opts): any;
+ tooltipStyle(): string;
+ tooltipStyle(_: string): this;
+ tooltipValueFormat(): string;
+ tooltipValueFormat(_: string): this;
+ tooltipSeriesColor(): string;
+ tooltipSeriesColor(_: string): this;
+ tooltipLabelColor(): string;
+ tooltipLabelColor(_: string): this;
+ tooltipValueColor(): string;
+ tooltipValueColor(_: string): this;
+ tooltipTick(): boolean;
+ tooltipTick(_: boolean): this;
+ tooltipOffset(): number;
+ tooltipOffset(_: number): this;
+ tooltipOffset_exists(): boolean;
+
// SimpleSelectionMixin
_selection: Utility.SimpleSelection;
}
-WordCloud.prototype._class += " chart_WordCloud";
-WordCloud.prototype.implements(I2DChart.prototype);
-WordCloud.prototype.implements(ITooltip.prototype);
-WordCloud.prototype.mixin(Utility.SimpleSelectionMixin);
WordCloud.prototype.publish("paletteID", "default", "set", "Color palette for this widget", WordCloud.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
WordCloud.prototype.publish("useClonedPalette", false, "boolean", "Enable or disable using a cloned palette", null, { tags: ["Intermediate", "Shared"] });
diff --git a/packages/chart/src/XYAxis.ts b/packages/chart/src/XYAxis.ts
index ca105f0708..f025c5acfb 100644
--- a/packages/chart/src/XYAxis.ts
+++ b/packages/chart/src/XYAxis.ts
@@ -16,7 +16,6 @@ export class XYAxis extends SVGWidget {
protected yBrush;
protected margin;
protected focusChart: XYAxis;
- _palette;
constructor() {
super();
@@ -191,7 +190,7 @@ export class XYAxis extends SVGWidget {
skipSelection(): boolean;
skipSelection(_: boolean): this;
skipSelection(_?: boolean): boolean | this {
- if (!arguments.length) return this._skipSelection;
+ if (_ === undefined) return this._skipSelection;
this._skipSelection = _;
return this;
}
@@ -571,8 +570,8 @@ export class XYAxis extends SVGWidget {
return masterColumns.indexOf(column);
}
- layerData(host: XYAxis): any[][] {
- if (arguments.length === 1) {
+ layerData(host?: XYAxis): any[][] {
+ if (host !== undefined) {
const indices = this.layerColumnIndices(host);
return host.data().map(row => {
const retVal = indices.map(idx => row[idx]);
@@ -659,6 +658,7 @@ XYAxis.prototype._class += " chart_XYAxis";
XYAxis.prototype.mixin(Utility.SimpleSelectionMixin);
export interface XYAxis {
+ _palette;
orientation(): "horizontal" | "vertical";
orientation(_: "horizontal" | "vertical"): this;
orientation_default(_: string);
diff --git a/packages/common/esbuild.js b/packages/common/esbuild.js
index 198f75c4ec..ed1937e83c 100644
--- a/packages/common/esbuild.js
+++ b/packages/common/esbuild.js
@@ -1,8 +1,12 @@
import { browserTpl, copyStaticFiles } from "@hpcc-js/esbuild-plugins";
+import pkg from "./package.json" with { type: "json" };
// config ---
browserTpl("src/index.ts", "dist/index", {
keepNames: true,
+ external: [
+ ...Object.keys(pkg.dependencies),
+ ],
plugins: [
copyStaticFiles({
src: "../../node_modules/font-awesome/fonts",
diff --git a/packages/common/index.html b/packages/common/index.html
index d9392a8e06..a4cc12208e 100644
--- a/packages/common/index.html
+++ b/packages/common/index.html
@@ -23,6 +23,18 @@
margin-top: 20px;
}
+
+
diff --git a/packages/common/src/Class.ts b/packages/common/src/Class.ts
index 10b4138ef9..60f29ac106 100644
--- a/packages/common/src/Class.ts
+++ b/packages/common/src/Class.ts
@@ -22,7 +22,7 @@ export class Class {
class(): string;
class(_: string): this;
class(_?: string): string | this {
- if (!arguments.length) return this._class;
+ if (_ === undefined) return this._class;
this._class = _;
return this;
}
diff --git a/packages/common/src/Database.ts b/packages/common/src/Database.ts
index 19c826f3b9..8e62fd2f04 100644
--- a/packages/common/src/Database.ts
+++ b/packages/common/src/Database.ts
@@ -40,7 +40,7 @@ export class Field extends PropertyExt {
owner(): Grid;
owner(_: Grid): this;
owner(_?: Grid): Grid | this {
- if (!arguments.length) return this._owner;
+ if (_ === undefined) return this._owner;
this._owner = _;
return this;
}
@@ -228,7 +228,7 @@ export class Grid extends PropertyExt {
}
legacyColumns(_?, asDefault?): any | Grid {
- if (!arguments.length) return this.row(0);
+ if (_ === undefined) return this.row(0);
this.row(0, _, asDefault);
return this;
}
@@ -253,7 +253,7 @@ export class Grid extends PropertyExt {
}
data(_?, clone?): any | Grid {
- if (!arguments.length) return this._data;
+ if (_ === undefined) return this._data;
this._data = clone ? _.map(function (d) { return d.map(function (d2) { return d2; }); }) : _;
this._dataCalcChecksum();
return this;
@@ -292,7 +292,7 @@ export class Grid extends PropertyExt {
private _dataCalcChecksum(idx?) {
++this._dataVersion;
if (this._dataChecksum) {
- if (arguments.length) {
+ if (idx !== undefined) {
this._dataChecksums[idx] = Utility.checksum(this._data[idx]);
} else {
this._dataChecksums = this._data.map(function (row) { return Utility.checksum(row); });
@@ -302,7 +302,7 @@ export class Grid extends PropertyExt {
}
row(row?, _?, asDefault?): any | Grid {
- if (arguments.length < 2) return row === 0 ? this.fields().map(function (d) { return d.label(); }) : this._data[row - 1];
+ if (_ === undefined) return row === 0 ? this.fields().map(function (d) { return d.label(); }) : this._data[row - 1];
if (row === 0) {
const fieldsArr = this.fields();
this.fields(_.map(function (field: string | INestedColumn, idx) {
@@ -334,7 +334,7 @@ export class Grid extends PropertyExt {
}
rows(_?): any | Grid {
- if (!arguments.length) return [this.row(0)].concat(this._data);
+ if (_ === undefined) return [this.row(0)].concat(this._data);
this.row(0, _[0]);
this._data = _.filter(function (_row, idx) { return idx > 0; });
this._dataCalcChecksum();
@@ -343,7 +343,7 @@ export class Grid extends PropertyExt {
// Column Access ---
column(col, _?): any | Grid {
- if (arguments.length < 2) return [this.fields()[col].label()].concat(this._data.map(function (row, _idx) { return row[col]; }));
+ if (_ === undefined) return [this.fields()[col].label()].concat(this._data.map(function (row, _idx) { return row[col]; }));
_.forEach(function (d, idx) {
if (idx === 0) {
this.fields()[col] = new Field().label(_[0]);
@@ -355,8 +355,8 @@ export class Grid extends PropertyExt {
return this;
}
- columnData(col, _): any | Grid {
- if (arguments.length < 2) return this._data.map(function (row, _idx) { return row[col]; });
+ columnData(col, _?): any | Grid {
+ if (_ === undefined) return this._data.map(function (row, _idx) { return row[col]; });
_.forEach(function (d, idx) {
this._data[idx][col] = d;
this._dataCalcChecksum(idx);
@@ -365,7 +365,7 @@ export class Grid extends PropertyExt {
}
columns(_?): any | Grid {
- if (!arguments.length) return this.fields().map(function (_col, idx) {
+ if (_ === undefined) return this.fields().map(function (_col, idx) {
return this.column(idx);
}, this);
_.forEach(function (_col, idx) {
@@ -375,8 +375,8 @@ export class Grid extends PropertyExt {
}
// Cell Access ---
- cell(row, col, _) {
- if (arguments.length < 3) return this.row(row)[col];
+ cell(row, col, _?) {
+ if (_ === undefined) return this.row(row)[col];
if (row === 0) {
this.fields()[col] = new Field().label(_);
} else {
@@ -604,7 +604,7 @@ export class Grid extends PropertyExt {
// Import/Export ---
jsonObj(_?): any | Grid {
- if (!arguments.length) return this._data.map(function (row) {
+ if (_ === undefined) return this._data.map(function (row) {
const retVal = {};
this.row(0).forEach(function (col, idx) {
retVal[col] = row[idx];
@@ -630,7 +630,7 @@ export class Grid extends PropertyExt {
json(_: string | object): this;
json(): string;
json(_?: string | object): string | this {
- if (!arguments.length) return JSON.stringify(this.jsonObj(), null, " ");
+ if (_ === undefined) return JSON.stringify(this.jsonObj(), null, " ");
if (typeof (_) === "string") {
_ = JSON.parse(_);
}
@@ -641,7 +641,7 @@ export class Grid extends PropertyExt {
csv(_: string): this;
csv(): string;
csv(_?: string): string | this {
- if (!arguments.length) {
+ if (_ === undefined) {
const temp = document.createElement("div");
return d3CsvFormatRows(this.grid().map(row => {
return row.map(cell => {
@@ -656,7 +656,7 @@ export class Grid extends PropertyExt {
tsv(_: string): this;
tsv(): string;
tsv(_?: string): string | this {
- if (!arguments.length) return d3TsvFormatRows(this.grid());
+ if (_ === undefined) return d3TsvFormatRows(this.grid());
this.jsonObj(d3TsvParse(_));
return this;
}
@@ -670,7 +670,7 @@ export interface Grid {
Grid.prototype.publish("fields", [], "propertyArray", "Fields");
const fieldsOrig = Grid.prototype.fields;
Grid.prototype.fields = function (_?, clone?) {
- if (!arguments.length) return fieldsOrig.apply(this, arguments);
+ if (_ === undefined) return fieldsOrig.apply(this, arguments);
return fieldsOrig.call(this, clone ? _.map(function (d) { return d.clone(); }) : _);
};
@@ -700,12 +700,12 @@ export class LegacyView {
return this._grid;
}
columns(_?) {
- if (!arguments.length) return this._grid.legacyColumns();
+ if (_ === undefined) return this._grid.legacyColumns();
this._grid.legacyColumns(_);
return this;
}
rawData(_?) {
- if (!arguments.length) return this._grid.legacyData();
+ if (_ === undefined) return this._grid.legacyData();
this._grid.legacyData(_);
return this;
}
diff --git a/packages/common/src/HTMLWidget.ts b/packages/common/src/HTMLWidget.ts
index d1c196d816..4a586efcc1 100644
--- a/packages/common/src/HTMLWidget.ts
+++ b/packages/common/src/HTMLWidget.ts
@@ -119,7 +119,7 @@ export class HTMLWidget extends Widget {
target(_: null | string | HTMLElement | SVGElement): this;
target(_?: null | string | HTMLElement | SVGElement): null | HTMLElement | SVGElement | this {
const retVal = super.target.apply(this, arguments);
- if (arguments.length) {
+ if (_ !== undefined) {
if (this._target instanceof SVGElement) {
// Target is a SVG Node, so create an item in the Overlay and force it "over" the overlay element (cough) ---
this._isRootNode = false;
diff --git a/packages/common/src/Palette.ts b/packages/common/src/Palette.ts
index 2317a9d343..56953f20f0 100644
--- a/packages/common/src/Palette.ts
+++ b/packages/common/src/Palette.ts
@@ -124,13 +124,13 @@ function palette_ordinal(id?, colors?): any {
ordinal.type = function () {
return "ordinal";
};
- ordinal.id = function (_) {
- if (!arguments.length) return id;
+ ordinal.id = function (_?) {
+ if (_ === undefined) return id;
id = _;
return ordinal;
};
- ordinal.colors = function (_) {
- if (!arguments.length) return colors;
+ ordinal.colors = function (_?) {
+ if (_ === undefined) return colors;
colors = _;
return ordinal;
};
@@ -145,11 +145,11 @@ function palette_ordinal(id?, colors?): any {
}
return this.clone(newID);
};
- ordinal.switch = function (_id, _colors) {
+ ordinal.switch = function (_id?, _colors?) {
if (id === _id) {
return this;
}
- return arguments.length ? fetchOrdinalItem(_id, _colors) : fetchOrdinalItem();
+ return _id !== undefined ? fetchOrdinalItem(_id, _colors) : fetchOrdinalItem();
};
return ordinal;
@@ -173,7 +173,7 @@ export function fetchRainbowItem(id?: string, colors?: string[], steps?: number)
}
function palette_rainbow(id?, _colors?, _steps?) {
- if (!arguments.length) {
+ if (id === undefined) {
const retVal = ["default"];
for (const key in m_colorbrewer) {
if (brewerOrdinal.indexOf(key) === -1) {
@@ -239,13 +239,13 @@ function palette_rainbow(id?, _colors?, _steps?) {
rainbow.type = function () {
return "rainbow";
};
- rainbow.id = function (_) {
- if (!arguments.length) return id;
+ rainbow.id = function (_?) {
+ if (_ === undefined) return id;
id = _;
return rainbow;
};
- rainbow.colors = function (_) {
- if (!arguments.length) return colors;
+ rainbow.colors = function (_?) {
+ if (_ === undefined) return colors;
colors = _;
return rainbow;
};
@@ -259,11 +259,11 @@ function palette_rainbow(id?, _colors?, _steps?) {
}
return this.clone(newID);
};
- rainbow.switch = function (_id, _colors) {
+ rainbow.switch = function (_id?, _colors?) {
if (id === _id) {
return this;
}
- return arguments.length ? fetchRainbowItem(_id, _colors) : fetchRainbowItem();
+ return _id !== undefined ? fetchRainbowItem(_id, _colors) : fetchRainbowItem();
};
return rainbow;
diff --git a/packages/common/src/PropertyExt.ts b/packages/common/src/PropertyExt.ts
index 29fd059c6c..849977ce04 100644
--- a/packages/common/src/PropertyExt.ts
+++ b/packages/common/src/PropertyExt.ts
@@ -267,7 +267,7 @@ export class PropertyExt extends Class {
id(): string;
id(_: string): this;
id(_?): string | this {
- if (!arguments.length) return this._id;
+ if (_ === undefined) return this._id;
this._id = _;
return this;
}
@@ -493,8 +493,8 @@ export class PropertyExt extends Class {
if (this[id]) {
} else {
if (type === "propertyArray") {
- this[id] = function (_) {
- if (!arguments.length) return this[__prop_ + id];
+ this[id] = function (_?) {
+ if (_ === undefined) return this[__prop_ + id];
this[__prop_ + id] = _.map(item => {
if (!meta.ext.noDeserialize && meta.ext.autoExpand && !(item instanceof meta.ext.autoExpand)) {
item = new meta.ext.autoExpand().deserialize(item);
@@ -505,8 +505,8 @@ export class PropertyExt extends Class {
return this;
};
} else {
- this[id] = function (_) {
- if (!arguments.length) return this[__prop_ + id];
+ this[id] = function (_?) {
+ if (_ === undefined) return this[__prop_ + id];
this[__prop_ + id] = _;
return this;
};
@@ -532,8 +532,8 @@ export class PropertyExt extends Class {
if (this[id + "_default"]() != null && !(this[id + "_default"]() === "" && ext.optional === true)) return true;
return false;
};
- this[id + "_default"] = function (_) {
- if (!arguments.length) return this[__default_ + id] !== undefined ? this[__default_ + id] : meta.defaultValue;
+ this[id + "_default"] = function (_?) {
+ if (_ === undefined) return this[__default_ + id] !== undefined ? this[__default_ + id] : meta.defaultValue;
if (_ === "") {
_ = null;
}
@@ -594,8 +594,8 @@ export class PropertyExt extends Class {
throw new Error(id + " is already published.");
}
this[__meta_ + id] = new MetaProxy(id, proxy, method, defaultValue);
- this[id] = function (_) {
- if (!arguments.length) return defaultValue === undefined || this[id + "_modified"]() ? this[proxy][method]() : defaultValue;
+ this[id] = function (_?) {
+ if (_ === undefined) return defaultValue === undefined || this[id + "_modified"]() ? this[proxy][method]() : defaultValue;
if (defaultValue !== undefined && _ === defaultValue) {
this[proxy][method + "_reset"]();
} else {
@@ -612,8 +612,8 @@ export class PropertyExt extends Class {
this[id + "_exists"] = function () {
return this[proxy][method + "_exists"]();
};
- this[id + "_default"] = function (_) {
- if (!arguments.length) return this[proxy][method + "_default"]();
+ this[id + "_default"] = function (_?) {
+ if (_ === undefined) return this[proxy][method + "_default"]();
this[proxy][method + "_default"](_);
return this;
};
diff --git a/packages/common/src/SVGWidget.ts b/packages/common/src/SVGWidget.ts
index 01ca77e659..f8b5ae84d1 100644
--- a/packages/common/src/SVGWidget.ts
+++ b/packages/common/src/SVGWidget.ts
@@ -164,9 +164,9 @@ export class SVGWidget extends Widget {
}
// Properties ---
- move(_, transitionDuration?) {
+ move(_?, transitionDuration?) {
const retVal = this.pos(_);
- if (arguments.length) {
+ if (_ !== undefined) {
(transitionDuration ? this._element.transition().duration(transitionDuration) : this._element)
.attr("transform", `translate(${_.x} ${_.y})scale(${this._widgetScale})`)
;
@@ -178,7 +178,7 @@ export class SVGWidget extends Widget {
enableOverflow(): boolean;
enableOverflow(_: boolean): this;
enableOverflow(_?: boolean): boolean | this {
- if (!arguments.length) return this._enableOverflow;
+ if (_ === undefined) return this._enableOverflow;
this._enableOverflow = _;
return this;
}
@@ -187,7 +187,7 @@ export class SVGWidget extends Widget {
enableOverflowScroll(): boolean;
enableOverflowScroll(_: boolean): this;
enableOverflowScroll(_?: boolean): boolean | this {
- if (!arguments.length) return this._enableOverflowScroll;
+ if (_ === undefined) return this._enableOverflowScroll;
this._enableOverflowScroll = _;
return this;
}
@@ -196,7 +196,7 @@ export class SVGWidget extends Widget {
size(_): this;
size(_?): ISize | this {
const retVal = super.size.apply(this, arguments);
- if (arguments.length) {
+ if (_ !== undefined) {
this._boundingBox = null;
}
return retVal;
@@ -239,7 +239,7 @@ export class SVGWidget extends Widget {
target(_: null | string | HTMLElement | SVGElement): this;
target(_?: null | string | HTMLElement | SVGElement): null | HTMLElement | SVGElement | this {
const retVal = super.target.apply(this, arguments);
- if (arguments.length) {
+ if (_ !== undefined) {
if (this._target instanceof SVGElement) {
this._isRootNode = false;
this._placeholderElement = d3Select(this._target);
diff --git a/packages/common/src/SVGZoomWidget.ts b/packages/common/src/SVGZoomWidget.ts
index 35f7c357b0..d0089637cd 100644
--- a/packages/common/src/SVGZoomWidget.ts
+++ b/packages/common/src/SVGZoomWidget.ts
@@ -414,7 +414,7 @@ SVGZoomWidget.prototype.publish("mouseMode", "zoom", "set", "Mouse Mode (zoom |
const _origMouseMode = SVGZoomWidget.prototype.mouseMode;
SVGZoomWidget.prototype.mouseMode = function (_?, transitionDuration?) {
const retVal = _origMouseMode.apply(this, arguments);
- if (arguments.length) {
+ if (_ !== undefined) {
if (_ === "zoom") {
safeRaise(this._zoomRoot.node());
} else {
diff --git a/packages/common/src/Shape.ts b/packages/common/src/Shape.ts
index 0dbb2808c4..3e9a4426f2 100644
--- a/packages/common/src/Shape.ts
+++ b/packages/common/src/Shape.ts
@@ -177,7 +177,7 @@ Shape.prototype.publish("tooltip", "", "string", "Tooltip", null, { tags: ["Priv
const _origRadius = Shape.prototype.radius;
Shape.prototype.radius = function (_?) {
const retVal = _origRadius.apply(this, arguments);
- if (arguments.length) {
+ if (_ !== undefined) {
this.width(_);
this.height(_);
return retVal;
diff --git a/packages/common/src/Surface.ts b/packages/common/src/Surface.ts
index f4e090b7f6..f9a5e20010 100644
--- a/packages/common/src/Surface.ts
+++ b/packages/common/src/Surface.ts
@@ -345,7 +345,7 @@ Surface.prototype.publish("menuPadding", 2, "number", "Menu Padding", null, { ta
Surface.prototype._origMenuParam = Surface.prototype.menu;
Surface.prototype.menu = function (this: Surface, _?) {
Surface.prototype._origMenuParam.apply(this, arguments);
- if (arguments.length) {
+ if (_ !== undefined) {
this._menuWidget.data(_);
return this;
}
@@ -355,7 +355,7 @@ Surface.prototype.menu = function (this: Surface, _?) {
Surface.prototype._origShowContent = Surface.prototype.showContent;
Surface.prototype.showContent = function (_?) {
const retVal = Surface.prototype._origShowContent.apply(this, arguments);
- if (arguments.length) {
+ if (_ !== undefined) {
if (this.content()) {
this.content().visible(this.showContent());
}
diff --git a/packages/common/src/TextBox.ts b/packages/common/src/TextBox.ts
index 9e63bfa346..9541104ab5 100644
--- a/packages/common/src/TextBox.ts
+++ b/packages/common/src/TextBox.ts
@@ -96,7 +96,7 @@ export class TextBox extends SVGWidget {
this._text
.x(this.getTextX(textBBox.width))
- .colorFill_default(this._shape.colorFill_exists() ? textColor(this._shape.colorFill()) : undefined)
+ .colorFill_default(this._shape.colorFill_exists() ? textColor(this._shape.colorFill()) : null)
.render()
;
diff --git a/packages/common/src/TitleBar.ts b/packages/common/src/TitleBar.ts
index 79c8ad62c4..416d3eac8f 100644
--- a/packages/common/src/TitleBar.ts
+++ b/packages/common/src/TitleBar.ts
@@ -52,7 +52,7 @@ export class Button extends HTMLWidget {
enabled(): boolean;
enabled(_: boolean): this;
enabled(_?: boolean): boolean | this {
- if (!arguments.length) return this._enabled;
+ if (_ === undefined) return this._enabled;
this._enabled = _;
return this;
}
@@ -133,7 +133,7 @@ export class SelectDropDown extends HTMLWidget {
enabled(): boolean;
enabled(_: boolean): this;
enabled(_?: boolean): boolean | this {
- if (!arguments.length) return this._enabled;
+ if (_ === undefined) return this._enabled;
this._enabled = _;
return this;
}
@@ -295,7 +295,7 @@ export class SelectionBar extends IconBar {
buttons(_: Array): this;
buttons(_?: Array): Array | this {
const retVal = super.buttons.apply(this, arguments);
- if (arguments.length) {
+ if (_ !== undefined) {
_.filter(b => b instanceof SelectionButton).forEach((sb: SelectionButton) => {
sb._owner = this;
});
diff --git a/packages/common/src/Transition.ts b/packages/common/src/Transition.ts
index 4dbbcbea7b..bb95f0ea50 100644
--- a/packages/common/src/Transition.ts
+++ b/packages/common/src/Transition.ts
@@ -14,20 +14,20 @@ export class Transition {
this._ease = d3CubicInOut;
}
- duration(_) {
- if (!arguments.length) return this._duration;
+ duration(_?) {
+ if (_ === undefined) return this._duration;
this._duration = _;
return this._widget;
}
- delay(_) {
- if (!arguments.length) return this._delay;
+ delay(_?) {
+ if (_ === undefined) return this._delay;
this._delay = _;
return this._widget;
}
- ease(_) {
- if (!arguments.length) return this._ease;
+ ease(_?) {
+ if (_ === undefined) return this._ease;
this._ease = _;
return this._widget;
}
diff --git a/packages/common/src/Utility.ts b/packages/common/src/Utility.ts
index 78b9725de4..2f7386ee26 100644
--- a/packages/common/src/Utility.ts
+++ b/packages/common/src/Utility.ts
@@ -152,14 +152,14 @@ export class SimpleSelection extends SelectionBase {
_widgetElement;
widgetElement(_?) {
- if (!arguments.length) return this._widgetElement;
+ if (_ === undefined) return this._widgetElement;
this._widgetElement = _;
return this;
}
_skipBringToTop;
- skipBringToTop(_) {
- if (!arguments.length) return this._skipBringToTop;
+ skipBringToTop(_?) {
+ if (_ === undefined) return this._skipBringToTop;
this._skipBringToTop = _;
return this;
}
@@ -220,8 +220,8 @@ export class SimpleSelection extends SelectionBase {
selected(domNode) {
return d3Select(domNode).classed("selected");
}
- selection(_) {
- if (!arguments.length) {
+ selection(_?) {
+ if (_ === undefined) {
return this.selection2().map(row => JSON.stringify(row));
}
this.selection2(d => _.indexOf(JSON.stringify(d)) >= 0);
@@ -230,7 +230,7 @@ export class SimpleSelection extends SelectionBase {
selection2(): any[];
selection2(isSelected: (d) => boolean): this;
selection2(isSelected?: (d) => boolean): any[] | this {
- if (!arguments.length) {
+ if (isSelected === undefined) {
const retVal: any[] = [];
if (this._widgetElement) {
this._widgetElement.selectAll(".selected")
@@ -418,16 +418,19 @@ export function templateFields(tpl: string): string[] {
return retVal;
}
-export function template(tpl: string, _args) {
+export function template(tpl?: string, _args?) {
if (!tpl) return "";
let args;
- if (arguments.length === 2 && typeof arguments[1] === "object") {
+ if (_args !== undefined && typeof _args === "object") {
args = arguments[1];
} else {
- args = new Array(arguments.length - 1);
- for (let i = 1; i < arguments.length; ++i) {
- args[i - 1] = arguments[i];
+ args = [];
+ if (tpl !== undefined) {
+ args.push(tpl);
+ if (_args !== undefined) {
+ args.push(_args);
+ }
}
}
@@ -650,10 +653,10 @@ export function checksum(s) {
export function getTime() {
return (now && now.call(perf)) || (new Date().getTime());
}
-export function mixin(dest, _sources) {
+export function mixin(dest, ...args: any[]) {
dest = dest || {};
- for (let i = 1, l = arguments.length; i < l; i++) {
- _mixin(dest, arguments[i]);
+ for (let i = 0, l = args.length; i < l; i++) {
+ _mixin(dest, args[i]);
}
return dest;
}
diff --git a/packages/common/src/Widget.ts b/packages/common/src/Widget.ts
index 283a913248..59a1b1ac7e 100644
--- a/packages/common/src/Widget.ts
+++ b/packages/common/src/Widget.ts
@@ -166,7 +166,7 @@ export abstract class Widget extends PropertyExt {
columns(): string[];
columns(_: string[], asDefault?: boolean): this;
columns(_?: string[], asDefault?: boolean): string[] | this {
- if (!arguments.length) return this._db.legacyColumns();
+ if (_ === undefined) return this._db.legacyColumns();
this._db.legacyColumns(_, asDefault);
return this;
}
@@ -194,7 +194,7 @@ export abstract class Widget extends PropertyExt {
data(): any;
data(_: any): this;
data(_?: any): any | this {
- if (!arguments.length) return this._db.legacyData();
+ if (_ === undefined) return this._db.legacyData();
this._db.legacyData(_);
return this;
}
@@ -237,7 +237,7 @@ export abstract class Widget extends PropertyExt {
pos(): IPos;
pos(_: IPos): this;
pos(_?: IPos): IPos | this {
- if (!arguments.length) return this._pos;
+ if (_ === undefined) return this._pos;
this._pos = _;
if (this._overlayElement) {
this._overlayElement
@@ -250,7 +250,7 @@ export abstract class Widget extends PropertyExt {
x(): number;
x(_): this;
x(_?): number | this {
- if (!arguments.length) return this._pos.x;
+ if (_ === undefined) return this._pos.x;
this.pos({ x: _, y: this._pos.y });
return this;
}
@@ -258,7 +258,7 @@ export abstract class Widget extends PropertyExt {
y(): number;
y(_): this;
y(_?): number | this {
- if (!arguments.length) return this._pos.y;
+ if (_ === undefined) return this._pos.y;
this.pos({ x: this._pos.x, y: _ });
return this;
}
@@ -266,7 +266,7 @@ export abstract class Widget extends PropertyExt {
size(): ISize;
size(_): this;
size(_?): ISize | this {
- if (!arguments.length) return this._size;
+ if (_ === undefined) return this._size;
this._size = _;
if (this._overlayElement) {
this._overlayElement
@@ -280,7 +280,7 @@ export abstract class Widget extends PropertyExt {
width(): number;
width(_): this;
width(_?): number | this {
- if (!arguments.length) return this._size.width;
+ if (_ === undefined) return this._size.width;
this.size({ width: _, height: this._size.height });
return this;
}
@@ -288,7 +288,7 @@ export abstract class Widget extends PropertyExt {
height(): number;
height(_): this;
height(_?): number | this {
- if (!arguments.length) return this._size.height;
+ if (_ === undefined) return this._size.height;
this.size({ width: this._size.width, height: _ });
return this;
}
@@ -314,7 +314,7 @@ export abstract class Widget extends PropertyExt {
scale(): number;
scale(_): Widget;
scale(_?): number | Widget {
- if (!arguments.length) return this._widgetScale;
+ if (_ === undefined) return this._widgetScale;
this._widgetScale = _;
if (this._overlayElement) {
this._overlayElement
@@ -327,7 +327,7 @@ export abstract class Widget extends PropertyExt {
visible(): boolean;
visible(_): this;
visible(_?): boolean | this {
- if (!arguments.length) return this._visible;
+ if (_ === undefined) return this._visible;
this._visible = _;
if (this._element) {
this._element
@@ -341,7 +341,7 @@ export abstract class Widget extends PropertyExt {
display(): boolean;
display(_): this;
display(_?): boolean | this {
- if (!arguments.length) return this._display;
+ if (_ === undefined) return this._display;
this._display = _;
if (this._element) {
this._element.style("display", this._display ? null : "none");
@@ -352,7 +352,7 @@ export abstract class Widget extends PropertyExt {
dataMeta(): DataMetaT;
dataMeta(_): this;
dataMeta(_?): DataMetaT | this {
- if (!arguments.length) return this._dataMeta;
+ if (_ === undefined) return this._dataMeta;
this._dataMeta = _;
return this;
}
@@ -361,7 +361,7 @@ export abstract class Widget extends PropertyExt {
appData(key: string): any;
appData(key: string, value: any): this;
appData(key: string, value?: any): any | this {
- if (arguments.length < 2) return this._appData[key];
+ if (value === undefined) return this._appData[key];
this._appData[key] = value;
return this;
}
@@ -535,7 +535,7 @@ export abstract class Widget extends PropertyExt {
target(): null | HTMLElement | SVGElement;
target(_: null | string | HTMLElement | SVGElement): this;
target(_?: null | string | HTMLElement | SVGElement): null | HTMLElement | SVGElement | this {
- if (!arguments.length) return this._target;
+ if (_ === undefined) return this._target;
if (this._target && _) {
throw new Error("Target can only be assigned once.");
}
@@ -720,10 +720,10 @@ Widget.prototype.publish("classed", {}, "object", "HTML Classes", null, { tags:
const origClassed = Widget.prototype.classed;
Widget.prototype.classed = function (this: Widget, str_obj?: string | { [classID: string]: boolean }, _?: boolean) {
if (typeof str_obj === "string") {
- if (arguments.length === 1) return origClassed.call(this)[str_obj];
+ if (_ === undefined) return origClassed.call(this)[str_obj];
const classed = origClassed.call(this);
origClassed.call(this, { ...classed, [str_obj]: _ });
return this;
}
- return origClassed.apply(this, arguments);
+ return origClassed.call(this, str_obj, _);
};
diff --git a/packages/common/tests/common.browser.spec.ts b/packages/common/tests/common.browser.spec.ts
index 3138987635..7e3e80b2df 100644
--- a/packages/common/tests/common.browser.spec.ts
+++ b/packages/common/tests/common.browser.spec.ts
@@ -8,6 +8,7 @@ const menuList = ["List item 1", "This is Item 2", "List item 3", "This is list
describe("Widget.classed", () => {
it("set/get", function () {
+ debugger;
const text = new Text()
.text("Hello\nand\nWelcome!")
.classed("TestClass0", true)
diff --git a/packages/comms/esbuild.js b/packages/comms/esbuild.js
index 88bf21b177..d4e797e59c 100644
--- a/packages/comms/esbuild.js
+++ b/packages/comms/esbuild.js
@@ -1,8 +1,14 @@
import { browserTpl, nodeTpl } from "@hpcc-js/esbuild-plugins";
+import pkg from "./package.json" with { type: "json" };
// config ---
await Promise.all([
nodeTpl("src/index.node.ts", "dist/index.node"),
- browserTpl("src/index.ts", "dist/index"),
+ browserTpl("src/index.ts", "dist/index", {
+ keepNames: true,
+ external: [
+ ...Object.keys(pkg.dependencies),
+ ]
+ }),
nodeTpl("utils/index.ts", "lib-esm/index")
]);
diff --git a/packages/comms/package.json b/packages/comms/package.json
index 66e0e82958..de26c35711 100644
--- a/packages/comms/package.json
+++ b/packages/comms/package.json
@@ -60,7 +60,7 @@
"dependencies": {
"@hpcc-js/ddl-shim": "^2.22.0",
"@hpcc-js/util": "^3.1.0",
- "@xmldom/xmldom": "0.9.4",
+ "@xmldom/xmldom": "0.9.5",
"abort-controller": "3.0.0",
"node-fetch": "3.3.2",
"safe-buffer": "5.2.1",
diff --git a/packages/comms/rollup.config.mjs b/packages/comms/rollup.config.mjs
deleted file mode 100644
index 678d1cc67e..0000000000
--- a/packages/comms/rollup.config.mjs
+++ /dev/null
@@ -1,55 +0,0 @@
-import { external, globals } from "@hpcc-js/bundle";
-import alias from '@rollup/plugin-alias';
-import commonjs from '@rollup/plugin-commonjs';
-import sourcemaps from 'rollup-plugin-sourcemaps';
-import nodeResolve from '@rollup/plugin-node-resolve';
-import postcss from "rollup-plugin-postcss";
-
-import pkg from "./package.json" with { type: "json" };
-
-const plugins = [
- alias({}),
- nodeResolve({
- preferBuiltins: true
- }),
- commonjs({}),
- sourcemaps(),
- postcss({
- extensions: [".css"],
- minimize: true
- })
-];
-
-export default [{
- input: "lib-es6/index",
- external: external,
- output: [{
- file: pkg.browser,
- format: "umd",
- sourcemap: true,
- globals: globals,
- name: pkg.name
- }, {
- file: pkg.module + ".js",
- format: "es",
- sourcemap: true,
- globals: globals
- }],
- plugins: plugins
-}, {
- input: "lib-es6/index.node",
- external: external,
- output: [{
- file: pkg.main,
- format: "cjs",
- sourcemap: true,
- globals: globals,
- name: pkg.name
- }, {
- file: pkg.module + ".js",
- format: "es",
- sourcemap: true,
- globals: globals
- }],
- plugins: plugins
-}];
\ No newline at end of file
diff --git a/packages/comms/src/connection.ts b/packages/comms/src/connection.ts
index 4a94ac9b89..08b6cdae9e 100644
--- a/packages/comms/src/connection.ts
+++ b/packages/comms/src/connection.ts
@@ -266,7 +266,7 @@ export class Connection implements IConnection {
opts(_: Partial): this;
opts(): IOptions;
opts(_?: Partial): this | IOptions {
- if (arguments.length === 0) return this._opts;
+ if (_ === undefined) return this._opts;
this._opts = { ...DefaultOptions, ..._ };
return this;
}
diff --git a/packages/comms/src/ecl/scope.ts b/packages/comms/src/ecl/scope.ts
index 87508aaa9f..11b952592a 100644
--- a/packages/comms/src/ecl/scope.ts
+++ b/packages/comms/src/ecl/scope.ts
@@ -105,7 +105,7 @@ export class BaseScope extends StateObject implements ScopeEx
children(): BaseScope[];
children(_: BaseScope[]): BaseScope;
children(_?: BaseScope[]): BaseScope[] | BaseScope {
- if (!arguments.length) return this._children;
+ if (_ === undefined) return this._children;
this._children = _!;
return this;
}
diff --git a/packages/dgrid-shim/package.json b/packages/dgrid-shim/package.json
index fc16f69645..9f74154534 100644
--- a/packages/dgrid-shim/package.json
+++ b/packages/dgrid-shim/package.json
@@ -43,7 +43,12 @@
"dojo": "1.17.3",
"dojo-dstore": "1.2.1",
"dojo-util": "1.17.3",
- "dojox": "1.17.3"
+ "dojox": "1.17.3",
+ "webpack": "5.95.0",
+ "webpack-cli": "5.1.4",
+ "webpack-hasjs-plugin": "1.0.4",
+ "dojo-webpack-plugin": "3.0.6",
+ "terser-webpack-plugin": "5.3.10"
},
"repository": {
"type": "git",
@@ -61,4 +66,4 @@
"url": "https://github.com/hpcc-systems/Visualization/issues"
},
"homepage": "https://github.com/hpcc-systems/Visualization#readme"
-}
+}
\ No newline at end of file
diff --git a/packages/dgrid/.vscode/launch.json b/packages/dgrid/.vscode/launch.json
index 760a72e834..7c2436335f 100644
--- a/packages/dgrid/.vscode/launch.json
+++ b/packages/dgrid/.vscode/launch.json
@@ -1,52 +1,47 @@
{
- // Use IntelliSense to learn about possible attributes.
- // Hover to view descriptions of existing attributes.
- // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
- "name": "Dev",
+ "name": "test-browser",
"type": "msedge",
"request": "launch",
- "url": "file:///${workspaceRoot}/index.html",
- "runtimeArgs": [
- "--allow-file-access-from-files",
- "--disable-web-security"
+ "url": "http://localhost:8888",
+ "webRoot": "${workspaceFolder}",
+ "outFiles": [
+ "${workspaceFolder}/**/*.js",
+ "!**/node_modules/**"
],
- "webRoot": "${workspaceRoot}"
},
{
- "name": "lws",
- "type": "msedge",
+ "name": "test-node",
+ "type": "node",
"request": "launch",
- "url": "http://localhost:8080/../packages/dgrid/index.html",
"runtimeArgs": [
- "--allow-file-access-from-files",
- "--disable-web-security"
+ "run-script",
+ "test-node"
],
- "webRoot": "${workspaceRoot}"
- },
- {
- "type": "msedge",
- "request": "launch",
- "name": "index.md",
- "url": "${workspaceFolder}/../../website/index.html?debug=1#packages/graph/docs/index.md",
- "runtimeArgs": [
- "--allow-file-access-from-files",
- "--disable-web-security"
+ "runtimeExecutable": "npm",
+ "skipFiles": [
+ "/**"
+ ],
+ "outFiles": [
+ "${workspaceFolder}/**/*.js",
+ "!**/node_modules/**"
],
- "webRoot": "${workspaceFolder}/../../website"
},
{
- "type": "msedge",
+ "name": "index.html",
"request": "launch",
- "name": "http index.md",
- "url": "http://localhost:8080/${workspaceFolder}/../../website/index.html?debug=1#packages/graph/docs/index.md",
+ "type": "msedge",
+ "url": "file:///${workspaceFolder}/index.html",
"runtimeArgs": [
- "--allow-file-access-from-files",
"--disable-web-security"
],
- "webRoot": "${workspaceFolder}/../../website"
+ "webRoot": "${workspaceFolder}",
+ "outFiles": [
+ "${workspaceFolder}/**/*.js",
+ "!**/node_modules/**"
+ ]
}
]
}
\ No newline at end of file
diff --git a/packages/dgrid/.vscode/tasks.json b/packages/dgrid/.vscode/tasks.json
index 89aac7c9d8..120545d06c 100644
--- a/packages/dgrid/.vscode/tasks.json
+++ b/packages/dgrid/.vscode/tasks.json
@@ -1,29 +1,20 @@
{
- // See https://go.microsoft.com/fwlink/?LinkId=733558
- // for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
+ "label": "gen-types-watch",
"type": "npm",
- "label": "compile umd watch",
- "script": "compile-umd-watch",
- "problemMatcher": [],
- "presentation": {
- "group": "group-build"
- }
- },
- {
- "type": "npm",
- "label": "compile es6 watch",
- "script": "compile-es6-watch",
- "problemMatcher": [],
+ "script": "gen-types-watch",
+ "problemMatcher": [
+ "$tsc-watch"
+ ],
"presentation": {
"group": "group-build"
}
},
{
+ "label": "bundle-watch",
"type": "npm",
- "label": "bundle watch",
"script": "bundle-watch",
"problemMatcher": [],
"presentation": {
@@ -31,17 +22,15 @@
}
},
{
- "label": "build-local-dev-server",
+ "label": "build",
"dependsOn": [
- "compile umd watch",
- "compile es6 watch",
- "bundle watch",
+ "gen-types-watch",
+ "bundle-watch",
],
"group": {
"kind": "build",
"isDefault": true
- },
- "problemMatcher": []
+ }
}
]
}
\ No newline at end of file
diff --git a/packages/dgrid/esbuild.js b/packages/dgrid/esbuild.js
new file mode 100644
index 0000000000..fe1b2e12f4
--- /dev/null
+++ b/packages/dgrid/esbuild.js
@@ -0,0 +1,12 @@
+import { browserTpl } from "@hpcc-js/esbuild-plugins";
+import pkg from "./package.json" with { type: "json" };
+
+// config ---
+await Promise.all([
+ browserTpl("src/index.ts", "dist/index", {
+ keepNames: true,
+ external: [
+ ...Object.keys(pkg.dependencies),
+ ]
+ })
+]);
diff --git a/packages/dgrid/index.html b/packages/dgrid/index.html
index 9b14493a58..762d198c0c 100644
--- a/packages/dgrid/index.html
+++ b/packages/dgrid/index.html
@@ -2,61 +2,81 @@
-
- @hpcc-js/dgrid
-
-
-
+ h1 {
+ text-align: center;
+ margin-top: 50px;
+ }
-
+
+
+
+
+
-
-
-
+
diff --git a/packages/dgrid/package.json b/packages/dgrid/package.json
index 26f46f75c3..0b99b76c91 100644
--- a/packages/dgrid/package.json
+++ b/packages/dgrid/package.json
@@ -1,54 +1,50 @@
{
"name": "@hpcc-js/dgrid",
- "version": "2.34.0",
+ "version": "3.0.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"
}
},
+ "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",
+ "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",
"stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
"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 -y npm-check-updates -u -t minor",
+ "update-major": "npx -y npm-check-updates -u"
},
"dependencies": {
- "@hpcc-js/common": "^2.73.0",
+ "@hpcc-js/common": "^3.1.0",
"@hpcc-js/ddl-shim": "^2.22.0",
"@hpcc-js/dgrid-shim": "^2.26.0",
- "@hpcc-js/util": "^2.53.0"
+ "@hpcc-js/util": "^3.1.0"
},
"devDependencies": {
- "@hpcc-js/bundle": "^2.12.0",
+ "@hpcc-js/esbuild-plugins": "^1.2.0",
+ "@testing-library/dom": "10.4.0",
"d3-format": "^1",
- "d3-selection": "^1",
- "tslib": "2.7.0"
+ "d3-selection": "^1"
},
"repository": {
"type": "git",
@@ -61,4 +57,4 @@
"url": "https://github.com/hpcc-systems/Visualization/issues"
},
"homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/dgrid/rollup.config.mjs b/packages/dgrid/rollup.config.mjs
deleted file mode 100644
index d437a5d847..0000000000
--- a/packages/dgrid/rollup.config.mjs
+++ /dev/null
@@ -1,59 +0,0 @@
-import { external, globals } from "@hpcc-js/bundle";
-import alias from '@rollup/plugin-alias';
-import commonjs from '@rollup/plugin-commonjs';
-import sourcemaps from 'rollup-plugin-sourcemaps';
-import nodeResolve from '@rollup/plugin-node-resolve';
-import postcss from "rollup-plugin-postcss";
-
-import pkg from "./package.json" with { type: "json" };
-
-export default {
- input: "lib-es6/index",
- external: external,
- output: [{
- file: pkg.main,
- format: "umd",
- sourcemap: true,
- globals: globals,
- name: pkg.name,
- strict: false
- }, {
- file: pkg.module + ".js",
- format: "es",
- sourcemap: true,
- globals: globals,
- name: pkg.name,
- strict: false
- }],
- plugins: [
- alias({
- entries: [
- { find: "d3-array", replacement: "@hpcc-js/common" },
- { find: "d3-brush", replacement: "@hpcc-js/common" },
- { find: "d3-collection", replacement: "@hpcc-js/common" },
- { find: "d3-color", replacement: "@hpcc-js/common" },
- { find: "d3-dispatch", replacement: "@hpcc-js/common" },
- { find: "d3-drag", replacement: "@hpcc-js/common" },
- { find: "d3-dsv", replacement: "@hpcc-js/common" },
- { find: "d3-ease", replacement: "@hpcc-js/common" },
- { find: "d3-format", replacement: "@hpcc-js/common" },
- { find: "d3-interpolate", replacement: "@hpcc-js/common" },
- { find: "d3-scale", replacement: "@hpcc-js/common" },
- { find: "d3-selection", replacement: "@hpcc-js/common" },
- { find: "d3-time-format", replacement: "@hpcc-js/common" },
- { find: "d3-transition", replacement: "@hpcc-js/common" },
- { find: "d3-zoom", replacement: "@hpcc-js/common" }
- ]
- }),
- nodeResolve({
- preferBuiltins: true
- }),
- commonjs({
- }),
- sourcemaps(),
- postcss({
- extensions: [".css"],
- minimize: true
- })
- ]
-};
\ No newline at end of file
diff --git a/packages/dgrid/src/Common.ts b/packages/dgrid/src/Common.ts
index fd9dc09814..6f6834820b 100644
--- a/packages/dgrid/src/Common.ts
+++ b/packages/dgrid/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,34 +19,16 @@ export class Common extends HTMLWidget {
this._tag = "div";
}
- @publish("...empty...", "string", "No Data Message")
- noDataMessage: publish;
- @publish("loading...", "string", "Loading Message")
- loadingMessage: publish;
- @publish(false, "boolean", "Enable paging")
- pagination: publish;
- @publish(25, "number", "Page size")
- pageSize: publish;
- @publish(false, "boolean", "Enable sorting by column")
- sortable: publish;
- @publish(null, "set", "Default 'sort by' Column ID", function () { return this.columns(); }, { optional: true })
- sortBy: publish;
- @publish(false, "boolean", "Default 'sort by' descending", null, { disable: self => !self.sortBy() })
- sortByDescending: publish;
- @publish(false, "boolean", "Multiple Selection")
- multiSelect: publish;
- @publish(true, "boolean", "Render HTML")
- renderHtml: publish;
-
// Backward Compatibility
mulitSelect(): boolean;
mulitSelect(_?: boolean): this;
mulitSelect(_?: boolean): this | boolean {
- return this.multiSelect.apply(this, arguments);
+ return this.multiSelect(_);
}
protected formatSortBy(): [{ property: string, descending: boolean }] | undefined {
- const idx = this.columns().indexOf(this.sortBy());
+ const cols = this.columns();
+ const idx = cols.indexOf(this.sortBy());
return idx >= 0 ? [{ property: idx.toString(), descending: this.sortByDescending() }] : undefined;
}
@@ -54,11 +36,11 @@ export class Common extends HTMLWidget {
selection(): any[];
selection(_: any[]): this;
selection(_?: any[]): any[] | this {
- if (!arguments.length) {
+ if (_ === undefined) {
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 +140,56 @@ export class Common extends HTMLWidget {
}
}
Common.prototype._class += " dgrid_Common";
+
+/*
+ @publish("...empty...", "string", "No Data Message")
+ noDataMessage: publish;
+ @publish("loading...", "string", "Loading Message")
+ loadingMessage: publish;
+ @publish(false, "boolean", "Enable paging")
+ pagination: publish;
+ @publish(25, "number", "Page size")
+ pageSize: publish;
+ @publish(false, "boolean", "Enable sorting by column")
+ sortable: publish;
+ @publish(null, "set", "Default 'sort by' Column ID", function () { return this.columns(); }, { optional: true })
+ sortBy: publish;
+ @publish(false, "boolean", "Default 'sort by' descending", null, { disable: self => !self.sortBy() })
+ sortByDescending: publish;
+ @publish(false, "boolean", "Multiple Selection")
+ multiSelect: publish;
+ @publish(true, "boolean", "Render HTML")
+ renderHtml: publish;
+*/
+
+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");
+
diff --git a/packages/dgrid/src/DBStore.ts b/packages/dgrid/src/DBStore.ts
index c436346f09..c31d77fb3e 100644
--- a/packages/dgrid/src/DBStore.ts
+++ b/packages/dgrid/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;
diff --git a/packages/dgrid/src/DatasourceStore.ts b/packages/dgrid/src/DatasourceStore.ts
index 0f0469174a..5b4d5a4cf9 100644
--- a/packages/dgrid/src/DatasourceStore.ts
+++ b/packages/dgrid/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;
diff --git a/packages/dgrid/src/DatasourceTable.ts b/packages/dgrid/src/DatasourceTable.ts
index 9b4092414f..69bc3d5202 100644
--- a/packages/dgrid/src/DatasourceTable.ts
+++ b/packages/dgrid/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,16 @@ export class DatasourceTable extends Common {
}
}
DatasourceTable.prototype._class += " dgrid_DatasourceTable";
+
+/*
+ @publish(null, "object", "Datasource")
+ datasource: { (): IDatasource; (_: IDatasource): DatasourceTable };
+ */
+
+export interface DatasourceTable {
+ datasource(): IDatasource;
+ datasource(_: IDatasource): this;
+}
+
+DatasourceTable.prototype.publish("datasource", null, "object", "Datasource");
+
diff --git a/packages/dgrid/src/Table.ts b/packages/dgrid/src/Table.ts
index c1471f6c33..0696460516 100644
--- a/packages/dgrid/src/Table.ts
+++ b/packages/dgrid/src/Table.ts
@@ -2,8 +2,8 @@
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 {
@@ -16,7 +16,7 @@ export class ColumnFormat extends PropertyExt {
owner(): Table;
owner(_: Table): this;
owner(_?: Table): Table | this {
- if (!arguments.length) return this._owner;
+ if (_ === undefined) return this._owner;
this._owner = _;
return this;
}
@@ -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))
@@ -103,8 +103,8 @@ export class Table extends Common {
}
fields(_?: any): any | this {
- const retVal = super.fields.apply(this, arguments);
- if (arguments.length) {
+ const retVal = super.fields(_);
+ if (_ !== undefined) {
const hash = hashSum({ _ });
if (this._prevFieldsHash !== hash) {
this._prevFieldsHash = hash;
@@ -115,8 +115,8 @@ export class Table extends Common {
}
columns(_?: any): any | this {
- const retVal = super.columns.apply(this, arguments);
- if (arguments.length) {
+ const retVal = super.columns(_);
+ if (_ !== undefined) {
const hash = hashSum({ _ });
if (this._prevColsHash !== hash) {
this._prevColsHash = hash;
@@ -127,8 +127,8 @@ export class Table extends Common {
}
data(_?: any): any | this {
- const retVal = super.data.apply(this, arguments);
- if (arguments.length) {
+ const retVal = super.data(_);
+ if (_ !== undefined) {
this._dataRefresh = true;
}
return retVal;
diff --git a/packages/dgrid/src/dgrid-shim.ts b/packages/dgrid/src/dgrid-shim.ts
new file mode 100644
index 0000000000..df7f91e696
--- /dev/null
+++ b/packages/dgrid/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 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;
diff --git a/packages/dgrid/src/index.ts b/packages/dgrid/src/index.ts
index 252ef5097a..71f3d4ad08 100644
--- a/packages/dgrid/src/index.ts
+++ b/packages/dgrid/src/index.ts
@@ -1,11 +1,11 @@
-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, domConstruct, Memory, QueryResults } from "./dgrid-shim.ts";
diff --git a/packages/dgrid/tests/dgrid.browser.spec.ts b/packages/dgrid/tests/dgrid.browser.spec.ts
new file mode 100644
index 0000000000..4b788c0a74
--- /dev/null
+++ b/packages/dgrid/tests/dgrid.browser.spec.ts
@@ -0,0 +1,121 @@
+import { Class, HTMLWidget, set, SVGWidget } from "@hpcc-js/common";
+import { describe, it, expect, test } from "vitest";
+import { classDef, renderMedium, renderShort, renderSmall, renderWide } from "../../common/tests/index.ts";
+
+let dgridMod: any;
+
+// test('load script dynamically', async () => {
+// console.log('Current working directory:', import.meta.resolve("../../dgrid-shim/dist/index.js"));
+
+// const script = document.createElement('script');
+// script.src = import.meta.resolve("../../dgrid-shim/dist/index.js");
+// script.type = 'text/javascript';
+// document.head.appendChild(script);
+// await new Promise((resolve) => {
+// script.onload = () => {
+// resolve();
+// }
+// });
+
+// dgridMod = await import("@hpcc-js/dgrid");
+// });
+
+
+const urlSearch: string = window.location.href.split("?")[1];
+const simple = {
+ ND: {
+ columns: ["Subject", "Year 1", "Year 2", "Year 3", "Year 4"],
+ data: [
+ ["English", 5, 43, 41, 92],
+ ["English II", 17, 43, 83, 93],
+ ["English III", 6, 43, 64, 93],
+ ["Geography", 7, 45, 52, 83],
+ ["Geography II", 16, 73, 52, 83],
+ ["Geography III", 26, 83, 11, 72],
+ ["Science", 66, 60, 85, 6],
+ ["Science II", 46, 20, 53, 7],
+ ["Science III", 46, 20, 38, 7],
+ ["Math", 98, 30, 23, 13],
+ ["Math II", 76, 30, 34, 6],
+ ["Math III", 80, 30, 27, 8]
+ ]
+ },
+};
+
+describe("@hpcc-js/dgrid", async () => {
+
+ const script = document.createElement('script');
+ script.src = import.meta.resolve("../../dgrid-shim/dist/index.js");
+ script.type = 'text/javascript';
+ document.head.appendChild(script);
+
+ await new Promise((resolve) => {
+ script.onload = () => {
+ resolve();
+ }
+ });
+
+ it("Shim Loaded", () => {
+ expect(window["dgrid_shim"]).to.exist;
+ });
+
+ const dgridMod = await import("@hpcc-js/dgrid");
+
+ it("dgridMod Loaded", () => {
+ expect(dgridMod).to.exist;
+ });
+
+ for (const key in dgridMod) {
+ const item = dgridMod[key];
+ if (item?.prototype?.constructor?.name) {
+ describe(`${item.prototype?.constructor?.name}`, () => {
+ it("Simple", () => {
+ expect(true).to.be.true;
+ });
+
+ if (item.prototype instanceof Class) {
+ it("Class Derived", () => {
+ expect(item.prototype instanceof Class).to.be.true;
+ });
+ }
+
+
+
+ if (item.prototype instanceof Class) {
+ classDef("dgrid", item);
+ }
+
+ if (item.prototype instanceof HTMLWidget || item.prototype instanceof SVGWidget) {
+ it(item.prototype.constructor.name, () => {
+ expect(true).to.be.true;
+ });
+ if (item instanceof dgridMod.Table) {
+ renderMedium(new dgridMod.Table()
+ .columns(simple.ND.columns)
+ .data(simple.ND.data)
+ );
+ }
+ switch (item.prototype.constructor) {
+ case dgridMod.Common:
+ case dgridMod.DatasourceTable:
+ break;
+ case dgridMod.Table:
+ it("renderMedium", () => {
+ expect(true).to.be.true;
+ });
+ renderMedium(new item.prototype.constructor()
+ .columns(simple.ND.columns)
+ .data(simple.ND.data)
+ );
+ break;
+ default:
+ it("Has render test", () => {
+ expect(false).to.be.true;
+ });
+ }
+ }
+ });
+
+ }
+ }
+});
diff --git a/packages/dgrid/tmp.txt b/packages/dgrid/tmp.txt
new file mode 100644
index 0000000000..80e8aba12e
--- /dev/null
+++ b/packages/dgrid/tmp.txt
@@ -0,0 +1,106 @@
+
+ DEV v2.1.4 /home/gordon/Visualization/packages/dgrid
+ [browser] Browser runner started by playwright at http://localhost:63315/
+
+ ✓ |browser| tests/dgrid.browser.spec.ts (28 tests) 209ms
+
+ Test Files 1 passed (1)
+ Tests 28 passed (28)
+ Start at 13:52:42
+ Duration 1.09s (transform 0ms, setup 0ms, collect 194ms, tests 209ms, environment 0ms, prepare 217ms)
+
+
+ PASS Waiting for file changes...
+ press h to show help, press q to quit
+c[3J
+ RERUN x1
+
+ ❯ |browser| tests/dgrid.browser.spec.ts (28 tests | 28 failed) 25ms
+ × @hpcc-js/dgrid > Shim Loaded 3ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > dgridMod Loaded 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > ColumnFormat > Simple 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > ColumnFormat > Class Derived 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > ColumnFormat > #constructor() > new 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > ColumnFormat > #constructor() > classID 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Common > Simple 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Common > Class Derived 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Common > #constructor() > new 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Common > #constructor() > classID 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Common > Common 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > DBStore > Simple 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > DatasourceCache > Simple 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > DatasourceStore > Simple 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > DatasourceTable > Simple 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > DatasourceTable > Class Derived 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > DatasourceTable > #constructor() > new 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > DatasourceTable > #constructor() > classID 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > DatasourceTable > DatasourceTable 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > RowFormatter > Simple 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Table > Simple 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Table > Class Derived 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Table > #constructor() > new 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Table > #constructor() > classID 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Table > Table 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Table > renderMedium 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Table > #render() > Basic render 1ms
+ → Page "none" not found
+ × @hpcc-js/dgrid > Table > #render() > exit, enter, render 1ms
+ → Page "none" not found
+
+⎯⎯⎯⎯⎯⎯ Unhandled Errors ⎯⎯⎯⎯⎯⎯
+
+Vitest caught 1 unhandled error during the test run.
+This might cause false positive tests. Resolve unhandled errors to make sure your tests are not affected.
+⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
+ Test Files 1 failed (1)
+ Tests 28 failed (28)
+ Errors 1 error
+ Start at 13:54:51
+ Duration 283ms
+
+
+ FAIL Tests failed. Watching for file changes...
+ press h to show help, press q to quit
+ rerun x1
+[2K[1A[2K[Gc[3J
+ RERUN x2
+
+ ✓ |browser| tests/dgrid.browser.spec.ts (28 tests) 207ms
+
+ Test Files 1 passed (1)
+ Tests 28 passed (28)
+ Start at 13:55:02
+ Duration 315ms
+
+
+ PASS Waiting for file changes...
+ press h to show help, press q to quit
+ rerun x2
+[2K[1A[2K[GCancelling test run. Press CTRL+c again to exit forcefully.
+
diff --git a/packages/dgrid/tsconfig.json b/packages/dgrid/tsconfig.json
index 74e240a333..318ecdd23e 100644
--- a/packages/dgrid/tsconfig.json
+++ b/packages/dgrid/tsconfig.json
@@ -1,22 +1,24 @@
{
- "extends": "../tsconfig.settings.json",
"compilerOptions": {
- "rootDir": "./src",
- "outDir": "./lib-umd",
- "declarationDir": "./types",
+ "rootDir": "src",
+ "module": "NodeNext",
+ "target": "ESNext",
+ "resolveJsonModule": true,
+ "emitDeclarationOnly": true,
+ "declaration": true,
+ "declarationDir": "types",
+ "strict": true,
+ "noImplicitAny": false,
+ "strictNullChecks": false,
+ "skipLibCheck": true,
+ "allowImportingTsExtensions": true,
+ "lib": [
+ "DOM",
+ "ESNext",
+ "ES2020"
+ ]
},
"include": [
- "./src/**/*"
- ],
- "references": [
- {
- "path": "../common"
- },
- {
- "path": "../ddl-shim"
- },
- {
- "path": "../dgrid-shim"
- },
+ "./src/index.ts"
]
}
\ No newline at end of file
diff --git a/packages/dgrid/vitest.workspace.ts b/packages/dgrid/vitest.workspace.ts
new file mode 100644
index 0000000000..fa7bb0720b
--- /dev/null
+++ b/packages/dgrid/vitest.workspace.ts
@@ -0,0 +1,6 @@
+import { defineWorkspace } from 'vitest/config';
+import baseWorkspace from '../../vitest.workspace.ts';
+
+export default defineWorkspace([
+ ...baseWorkspace
+])
\ No newline at end of file
diff --git a/packages/esbuild-plugins/src/remove-strict.ts b/packages/esbuild-plugins/src/remove-strict.ts
index 8a764dd47f..d0523666ed 100644
--- a/packages/esbuild-plugins/src/remove-strict.ts
+++ b/packages/esbuild-plugins/src/remove-strict.ts
@@ -8,6 +8,7 @@ export function removeStrict(): Plugin {
build.initialOptions.write = false;
build.onEnd((result) => {
result?.outputFiles?.forEach(file => {
+ console.log(file.path);
if (file.path.endsWith(".js")) {
const contents = file.text.replace(/"use strict";/g, "");
if (contents.indexOf("use strict") >= 0) {
diff --git a/packages/markdown-it-plugins/.vscode/launch.json b/packages/markdown-it-plugins/.vscode/launch.json
index 55300a72e6..c5e43dbf15 100644
--- a/packages/markdown-it-plugins/.vscode/launch.json
+++ b/packages/markdown-it-plugins/.vscode/launch.json
@@ -73,7 +73,7 @@
"name": "index.html",
"request": "launch",
"type": "msedge",
- "url": "http://localhost:5174/${workspaceFolder}/index.html",
+ "url": "file:///${workspaceFolder}/index.html",
"runtimeArgs": [
"--disable-web-security"
],
diff --git a/packages/markdown-it-plugins/esbuild.js b/packages/markdown-it-plugins/esbuild.js
index ee36c5c86d..610ba98555 100644
--- a/packages/markdown-it-plugins/esbuild.js
+++ b/packages/markdown-it-plugins/esbuild.js
@@ -1,9 +1,15 @@
import { nodeTpl, browserTpl } from "@hpcc-js/esbuild-plugins";
+import pkg from "./package.json" with { type: "json" };
// config ---
await Promise.all([
nodeTpl("src/index.ts", "dist/index.node"),
nodeTpl("src/loader.ts", "dist/loader.node", { supported: { "dynamic-import": true } }),
nodeTpl("src/ecl-lang/index.ts", "dist/ecl-lang"),
- browserTpl("src/index.ts", "dist/index")
+ browserTpl("src/index.ts", "dist/index", {
+ keepNames: true,
+ external: [
+ ...Object.keys(pkg.dependencies),
+ ]
+ })
]);
diff --git a/packages/markdown-it-plugins/index.html b/packages/markdown-it-plugins/index.html
index 2a07d12828..67702d5c13 100644
--- a/packages/markdown-it-plugins/index.html
+++ b/packages/markdown-it-plugins/index.html
@@ -1,22 +1,68 @@
-
-
+
+
-
-
-
- Vite + TS
+ Home
+
+
+
-
-
-
-
+
+
\ No newline at end of file
diff --git a/packages/observablehq-compiler/.vscode/launch.json b/packages/observablehq-compiler/.vscode/launch.json
index 3ee32e4122..7c2436335f 100644
--- a/packages/observablehq-compiler/.vscode/launch.json
+++ b/packages/observablehq-compiler/.vscode/launch.json
@@ -28,6 +28,20 @@
"${workspaceFolder}/**/*.js",
"!**/node_modules/**"
],
+ },
+ {
+ "name": "index.html",
+ "request": "launch",
+ "type": "msedge",
+ "url": "file:///${workspaceFolder}/index.html",
+ "runtimeArgs": [
+ "--disable-web-security"
+ ],
+ "webRoot": "${workspaceFolder}",
+ "outFiles": [
+ "${workspaceFolder}/**/*.js",
+ "!**/node_modules/**"
+ ]
}
]
}
\ No newline at end of file
diff --git a/packages/observablehq-compiler/.vscode/tasks.json b/packages/observablehq-compiler/.vscode/tasks.json
index a046004a24..120545d06c 100644
--- a/packages/observablehq-compiler/.vscode/tasks.json
+++ b/packages/observablehq-compiler/.vscode/tasks.json
@@ -1,17 +1,6 @@
{
"version": "2.0.0",
"tasks": [
- {
- "label": "check-watch",
- "type": "npm",
- "script": "check-watch",
- "problemMatcher": [
- "$tsc-watch"
- ],
- "presentation": {
- "group": "group-build"
- }
- },
{
"label": "gen-types-watch",
"type": "npm",
@@ -32,21 +21,11 @@
"group": "group-build"
}
},
- {
- "type": "npm",
- "label": "test-serve",
- "script": "test-serve",
- "presentation": {
- "group": "group-build"
- }
- },
{
"label": "build",
"dependsOn": [
- "check-watch",
"gen-types-watch",
"bundle-watch",
- "test-serve"
],
"group": {
"kind": "build",
diff --git a/packages/observablehq-compiler/index.html b/packages/observablehq-compiler/index.html
index 573ce667ae..ed07c93d27 100644
--- a/packages/observablehq-compiler/index.html
+++ b/packages/observablehq-compiler/index.html
@@ -1,21 +1,53 @@
-
+
-
- @hpcc-js/observable-md
-
-
-
-
+ Home
+
+
+
+
-
-
-
+ const notebook = omd2notebook(md);
+ const compiled = await compile(notebook);
+
+ const library = new Library();
+ const runtime = new Runtime(library);
+
+ const placeholder = document.getElementById("placeholder");
+ const main = compiled(runtime, name => {
+ if (placeholder) {
+ const div = globalThis?.document.createElement("div");
+ placeholder.appendChild(div);
+ return new Inspector(div);
+ }
+ return {
+ pending() { },
+ fulfilled(value) { console.info("fulfilled", name, value); },
+ rejected(error) { console.error("rejected", name, error); },
+ };
+ });
+
\ No newline at end of file
diff --git a/packages/observablehq-compiler/package.json b/packages/observablehq-compiler/package.json
index 39eb14bf32..e3abf619cb 100644
--- a/packages/observablehq-compiler/package.json
+++ b/packages/observablehq-compiler/package.json
@@ -28,6 +28,7 @@
"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-node": "vitest run --project node",
diff --git a/packages/util/package.json b/packages/util/package.json
index ba154bddd1..34adefe561 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -34,7 +34,7 @@
"update-major": "npx -y npm-check-updates -u"
},
"dependencies": {
- "@xmldom/xmldom": "0.9.4"
+ "@xmldom/xmldom": "0.9.5"
},
"devDependencies": {
"@hpcc-js/bundle": "^2.12.0",
diff --git a/resources/hpcc-systems-dark.svg b/resources/hpcc-systems-dark.svg
new file mode 100644
index 0000000000..1484707bcb
--- /dev/null
+++ b/resources/hpcc-systems-dark.svg
@@ -0,0 +1,79 @@
+
+
\ No newline at end of file
diff --git a/resources/hpcc-systems.svg b/resources/hpcc-systems.svg
new file mode 100644
index 0000000000..316847edf3
--- /dev/null
+++ b/resources/hpcc-systems.svg
@@ -0,0 +1,69 @@
+
\ No newline at end of file
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
index 2de489cc51..d43fc45e25 100644
--- a/vitest.workspace.ts
+++ b/vitest.workspace.ts
@@ -1,10 +1,11 @@
-import { defineWorkspace } from 'vitest/config'
+import { configDefaults, defineWorkspace } from 'vitest/config'
export default defineWorkspace([
{
test: {
name: 'node',
exclude: [
+ ...configDefaults.exclude,
'**/*.browser.spec.{ts,js}',
"**/node_modules/**",
"**/.nx/**",
@@ -13,12 +14,15 @@ export default defineWorkspace([
"**/demos/**",
"**/src/**",
],
- environment: 'node'
+ environment: 'node',
+ setupFiles: []
}
}, {
test: {
name: 'browser',
exclude: [
+ ...configDefaults.exclude,
+ "@hpcc-js/dgrid-shim",
'**/*.node.spec.{ts,js}',
"**/node_modules/**",
"**/.nx/**",
@@ -39,6 +43,7 @@ export default defineWorkspace([
},
screenshotFailures: false
},
+ setupFiles: []
}
}
])