Skip to content

Commit f348ae2

Browse files
dcamperdcamper
authored
Merge pull request #86 from GordonSmith/UNDICI
fix: security bump versions
2 parents ff162f4 + ec0e945 commit f348ae2

9 files changed

Lines changed: 2509 additions & 857 deletions

File tree

‎report/package-lock.json‎

Lines changed: 2417 additions & 766 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎report/package.json‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"private": true,
33
"name": "datapatterns",
44
"version": "0.0.0",
5+
"type": "module",
56
"description": "",
67
"main": "dist/index.js",
78
"scripts": {
8-
"clean": "rimraf lib* types dist res/*.js res/*.map",
9+
"clean": "rimraf --glob lib* types dist res/*.js res/*.map",
910
"compile-es6": "tsc --importHelpers true --module es6 --outDir ./lib-es6",
1011
"compile-es6-watch": "npm run compile-es6 -- -w",
1112
"compile-umd": "tsc --module umd --outDir ./lib-umd",
@@ -16,27 +17,37 @@
1617
"watch": "run-p compile-es6-watch bundle-watch",
1718
"link-hpcc-js": "mklink /J hpcc-js ..\\hpcc-js",
1819
"lint": "tslint --project . src/**/*.ts",
19-
"docs": "typedoc --options tdoptions.json ."
20+
"docs": "typedoc --options tdoptions.json .",
21+
"update-major": "npx -y npm-check-updates -u",
22+
"update": "npx -y npm-check-updates -u -t minor"
2023
},
2124
"dependencies": {
22-
"@hpcc-js/util": "2.29.0",
23-
"@hpcc-js/comms": "3.7.7",
24-
"@hpcc-js/common": "2.47.0",
25-
"@hpcc-js/api": "2.8.42",
26-
"@hpcc-js/chart": "2.57.0",
27-
"@hpcc-js/html": "2.22.0",
28-
"@hpcc-js/layout": "2.24.0",
29-
"@hpcc-js/phosphor": "2.14.37",
30-
"@hpcc-js/other": "2.13.57"
25+
"@hpcc-js/api": "3.4.5",
26+
"@hpcc-js/chart": "3.6.1",
27+
"@hpcc-js/common": "3.6.1",
28+
"@hpcc-js/comms": "3.14.0",
29+
"@hpcc-js/ddl-shim": "3.2.3",
30+
"@hpcc-js/dgrid2": "3.5.3",
31+
"@hpcc-js/html": "3.3.5",
32+
"@hpcc-js/layout": "3.5.0",
33+
"@hpcc-js/other": "3.4.6",
34+
"@hpcc-js/phosphor": "3.4.3",
35+
"@hpcc-js/react": "3.4.5",
36+
"@hpcc-js/util": "3.4.4"
3137
},
3238
"devDependencies": {
33-
"npm-run-all": "^4.1.5",
34-
"rimraf": "^3.0.2",
35-
"rollup": "^3.29.5",
36-
"@rollup/plugin-node-resolve": "^11.2.0",
37-
"terser": "^5.6.0",
38-
"tslib": "^2.1.0",
39-
"typescript": "^4.2.3"
39+
"@lumino/algorithm": "2.0.4",
40+
"@lumino/commands": "2.3.3",
41+
"@lumino/messaging": "2.0.4",
42+
"@lumino/widgets": "2.7.3",
43+
"@rollup/plugin-node-resolve": "16.0.3",
44+
"npm-run-all": "4.1.5",
45+
"preact": "10.28.2",
46+
"rimraf": "6.1.2",
47+
"rollup": "4.56.0",
48+
"terser": "5.46.0",
49+
"tslib": "2.8.1",
50+
"typescript": "5.9.3"
4051
},
4152
"repository": {
4253
"type": "git",
@@ -48,4 +59,4 @@
4859
"url": "https://github.com/hpcc-systems/DataPatterns/issues"
4960
},
5061
"homepage": "https://github.com/hpcc-systems/DataPatterns"
51-
}
62+
}

‎report/res/index.html‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,50 @@
55
<meta charset="utf-8">
66
<title>HPCC: Visualization</title>
77
<link href="./index.css" rel="stylesheet">
8-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@hpcc-js/common@2.47.0/font-awesome/css/font-awesome.min.css">
9-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/util@2.29.0"></script>
10-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/comms@2.40.0"></script>
11-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/common@2.47.0"></script>
12-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/api@2.8.42"></script>
13-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/chart@2.57.0"></script>
14-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/html@2.22.0"></script>
15-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/layout@2.24.0"></script>
16-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/phosphor@2.14.37"></script>
17-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/other@2.13.57"></script>
8+
<link rel="stylesheet" href="https://esm.run/@hpcc-js/common@3.6.1/font-awesome/css/font-awesome.min.css">
9+
<script type="importmap">
10+
{
11+
"imports": {
12+
"@hpcc-js/util": "https://esm.run/@hpcc-js/util@3.4.4",
13+
"@hpcc-js/comms": "https://esm.run/@hpcc-js/comms@3.14.0",
14+
"@hpcc-js/common": "https://esm.run/@hpcc-js/common@3.6.1",
15+
"@hpcc-js/api": "https://esm.run/@hpcc-js/api@3.4.5",
16+
"@hpcc-js/chart": "https://esm.run/@hpcc-js/chart@3.6.1",
17+
"@hpcc-js/dgrid2": "https://esm.run/@hpcc-js/dgrid2@3.5.3",
18+
"@hpcc-js/html": "https://esm.run/@hpcc-js/html@3.3.5",
19+
"@hpcc-js/layout": "https://esm.run/@hpcc-js/layout@3.5.0",
20+
"@hpcc-js/phosphor": "https://esm.run/@hpcc-js/phosphor@3.4.3",
21+
"@hpcc-js/react": "https://esm.run/@hpcc-js/react@3.4.5",
22+
"@hpcc-js/other": "https://esm.run/@hpcc-js/other@3.4.6"
23+
}
24+
}
25+
</script>
26+
1827
<script>
28+
// Polyfill for Node.js globals needed by some dependencies
29+
window.process = window.process || { env: { NODE_ENV: 'production' }, browser: true };
30+
1931
var espUrl = window.location.href;
2032
var debugWuid = window.location.search.split("?")[1];
2133
if (debugWuid) {
22-
espUrl = "http://play.hpccsystems.com:8010/WsWorkunits/res/" + debugWuid + "/report/res/index.html";
34+
espUrl = "https://play.hpccsystems.com:18010/WsWorkunits/res/" + debugWuid + "/report/res/index.html";
2335
}
2436
</script>
2537
</head>
2638

2739
<body onresize="resize();">
2840
<div id="placeholder"></div>
29-
<script src="./index.min.js"></script>
30-
<script>
31-
var app = new datapatterns.ReportTabs(espUrl)
41+
<script type="module">
42+
import { ReportTabs } from "./index.min.js";
43+
globalThis.__hpcc_app = new ReportTabs(espUrl)
3244
.target("placeholder")
3345
;
3446
resize();
35-
47+
</script>
48+
<script>
3649
function resize() {
37-
if (app) {
38-
app
50+
if (globalThis.__hpcc_app) {
51+
globalThis.__hpcc_app
3952
.resize()
4053
.lazyRender()
4154
;

‎report/res/index.min.js‎

Lines changed: 1 addition & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎report/rollup.config.js‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
1+
import { readFileSync } from 'fs';
12
import nodeResolve from '@rollup/plugin-node-resolve';
23

3-
const pkg = require("./package.json");
4+
const pkg = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'));
45

56
function externals(id) {
67
return id.indexOf("@hpcc-js/") === 0;
78
}
89

9-
function globals(id) {
10-
if (id.indexOf("@hpcc-js") === 0) {
11-
return id;
12-
}
13-
return undefined;
14-
}
15-
1610
export default {
1711
input: "lib-es6/index",
1812
external: externals,
1913
output: {
2014
file: pkg.main,
21-
format: "umd",
15+
format: "es",
2216
sourcemap: true,
23-
globals: globals,
2417
name: pkg.name
2518
},
2619
plugins: [
27-
nodeResolve()
20+
nodeResolve({
21+
browser: true
22+
})
2823
]
2924
};

‎report/runTest.ecl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
IMPORT ^ as DataPatterns;
22

3-
filePath := '~class::pfb::out::vehiclereexpanded';
3+
filePath := '~regress::multi::person';
44

55
ds := DATASET(filePath, RECORDOF(filePath, LOOKUP), FLAT);
66

‎report/src/index.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Widget } from "@hpcc-js/common";
2-
import { Result, Workunit, WUInfo } from "@hpcc-js/comms";
2+
import { Result, Workunit, WsWorkunits } from "@hpcc-js/comms";
33
import { Grid } from "@hpcc-js/layout";
44
import { Html } from "@hpcc-js/other";
55
import { DockPanel } from "@hpcc-js/phosphor";
66
import { BreakdownTable, StyledTable } from "@hpcc-js/html";
77
import { StatChart } from "./statChart";
88

9-
const knownProfileField = (sch: WUInfo.ECLSchemaItem): boolean => ["attribute", "given_attribute_type", "best_attribute_type", "rec_count", "fill_count", "fill_rate", "cardinality", "cardinality_breakdown", "modes", "min_length", "max_length", "ave_length", "popular_patterns", "rare_patterns", "is_numeric", "numeric_min", "numeric_max", "numeric_mean", "numeric_std_dev", "numeric_lower_quartile", "numeric_median", "numeric_upper_quartile", "numeric_correlations"].indexOf(sch.ColumnName) > 0;
9+
const knownProfileField = (sch: WsWorkunits.ECLSchemaItem): boolean => ["attribute", "given_attribute_type", "best_attribute_type", "rec_count", "fill_count", "fill_rate", "cardinality", "cardinality_breakdown", "modes", "min_length", "max_length", "ave_length", "popular_patterns", "rare_patterns", "is_numeric", "numeric_min", "numeric_max", "numeric_mean", "numeric_std_dev", "numeric_lower_quartile", "numeric_median", "numeric_upper_quartile", "numeric_correlations"].indexOf(sch.ColumnName) > 0;
1010
const countProfileFields = (r: Result): number => r.ECLSchemas.ECLSchemaItem.filter(knownProfileField).length;
1111
const isProfileResult = (r: Result): boolean => countProfileFields(r) >= 4;
1212

@@ -41,29 +41,29 @@ export class ReportTabs extends DockPanel {
4141
}
4242
_prevFetch;
4343
render(callback?: (w: Widget) => void): this {
44-
if(!this._prevFetch){
44+
if (!this._prevFetch) {
4545
this._prevFetch = this._wu.fetchResults()
4646
.then(results => {
4747
Promise.all(results.filter(isProfileResult).map(result => {
48-
return result.fetchRows().then(rows => {
49-
return {
50-
result,
51-
report: new Report(rows)
52-
}
53-
});
54-
})).then((resultReports: any) => {
55-
resultReports.forEach((r: any,i) => {
56-
if (i === 0) {
57-
this.addWidget(r.report, r.result.Name);
58-
} else {
59-
this.addWidget(r.report, r.result.Name, "tab-after", resultReports[i - 1].report);
60-
}
61-
});
48+
return result.fetchRows().then(rows => {
49+
return {
50+
result,
51+
report: new Report(rows)
52+
}
6253
});
54+
})).then((resultReports: any) => {
55+
resultReports.forEach((r: any, i) => {
56+
if (i === 0) {
57+
this.addWidget(r.report, r.result.Name);
58+
} else {
59+
this.addWidget(r.report, r.result.Name, "tab-after", resultReports[i - 1].report);
60+
}
61+
});
62+
});
6363
});
6464
}
6565
this._prevFetch
66-
.then(()=>{
66+
.then(() => {
6767
super.render(w => {
6868
if (callback) {
6969
callback(this as any);

‎report/src/statChart.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function myFormatter(format: string): (num: number) => string {
3030
export class StatChart extends HTMLWidget {
3131

3232
private _selectMode: any;
33-
private _tickFormatter: (_: number) => string;
33+
private _tickFormatter: (_: number) => string = (_: number) => "" + _;
3434

3535
private _bellCurve = new Scatter()
3636
.columns(["", "Std. Dev."])

‎report/tsconfig.json‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
{
22
"compilerOptions": {
33
"outDir": "./lib-umd",
4-
"target": "es5",
5-
"module": "umd",
4+
"target": "es2022",
5+
"module": "es2022",
66
"moduleResolution": "node",
77
"sourceMap": true,
88
"declaration": true,
99
"declarationDir": "./types",
10-
"noImplicitAny": false,
1110
"noEmitOnError": false,
12-
"noUnusedLocals": true,
13-
"strictNullChecks": true,
14-
"noImplicitThis": true,
15-
"importHelpers": false,
11+
"strict": true,
12+
"noImplicitAny": false,
1613
"lib": [
1714
"dom",
18-
"es5",
19-
"es2015.promise"
15+
"es2022"
2016
],
2117
"types": []
2218
},

0 commit comments

Comments
 (0)