Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Joscha 2023-10-21 16:49:57 +02:00
parent ce331877a8
commit 0d48e0791b
4 changed files with 553 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

956
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

42
Cargo.toml
View file

@ -4,16 +4,16 @@ version = "0.0.0"
edition = "2021"
[dependencies]
anyhow = "1.0.72"
askama = { version = "0.12.0", features = ["with-axum"] }
anyhow = "1.0.75"
askama = { version = "0.12.1", features = ["with-axum"] }
askama_axum = "0.3.0"
axum = { version = "0.6.19", features = ["macros", "headers"] }
axum-extra = { version = "0.7.7", features = ["typed-routing", "query"] }
bytes = "1.4.0"
clap = { version = "4.3.19", features = ["derive", "deprecated"] }
axum = { version = "0.6.20", features = ["macros", "headers"] }
axum-extra = { version = "0.8.0", features = ["typed-routing", "query"] }
bytes = "1.5.0"
clap = { version = "4.4.6", features = ["derive", "deprecated"] }
directories = "5.0.1"
env_logger = "0.10.0"
flate2 = "1.0.26"
flate2 = "1.0.28"
futures = "0.3.28"
gethostname = "0.4.3"
humantime = "2.1.0"
@ -21,36 +21,36 @@ log = "0.4.20"
mime_guess = "2.0.4"
open = "5.0.0"
rand = "0.8.5"
regex = "1.9.3"
rust-embed = { version = "6.8.1", features = ["interpolate-folder-path"] }
serde = { version = "1.0.181", features = ["derive"] }
regex = "1.10.2"
rust-embed = { version = "8.0.0", features = ["interpolate-folder-path"] }
serde = { version = "1.0.189", features = ["derive"] }
serde-humanize-rs = "0.1.1"
serde_repr = "0.1.16"
sqlx = { version = "0.7.1", features = ["runtime-tokio", "sqlite", "time"] }
sqlx = { version = "0.7.2", features = ["runtime-tokio", "sqlite", "time"] }
tar = { version = "0.4.40", default-features = false }
tempfile = "3.7.1"
tokio = { version = "1.29.1", features = ["full"] }
tempfile = "3.8.0"
tokio = { version = "1.33.0", features = ["full"] }
tokio-stream = "0.1.14"
toml = "0.7.6"
walkdir = "2.3.3"
toml = "0.8.2"
walkdir = "2.4.0"
[dependencies.gix]
version = "0.51.0"
version = "0.55.2"
default-features = false
features = ["max-performance-safe", "worktree-stream"]
features = ["max-performance-safe", "revision", "worktree-stream"]
[dependencies.reqwest]
version = "0.11.18"
version = "0.11.22"
default-features = false
features = ["json", "stream", "rustls-tls-native-roots"]
[dependencies.time]
version = "0.3.25"
version = "0.3.30"
features = ["formatting", "parsing", "macros", "serde-human-readable"]
[build-dependencies]
vergen = { version = "8.2.4", features = ["git", "gitcl"] }
walkdir = "2.3.3"
vergen = { version = "8.2.5", features = ["git", "gitcl"] }
walkdir = "2.4.0"
[profile.dev.package.sqlx-macros]
opt-level = 3

11
scripts/uPlot.d.ts vendored
View file

@ -277,7 +277,7 @@ declare namespace uPlot {
show?: boolean; // true
/** show series values at current cursor.idx */
live?: boolean; // true
/** swiches primary interaction mode to toggle-one/toggle-all */
/** switches primary interaction mode to toggle-one/toggle-all */
isolate?: boolean; // false
/** series indicators */
markers?: Legend.Markers;
@ -656,6 +656,15 @@ declare namespace uPlot {
/** tuples of canvas pixel coordinates that were used to construct the gaps clip */
gaps?: [from: number, to: number][];
/** line width in CSS pixels, if differs from series.width (for dynamic rendering optimization) */
width?: number;
/** fill style, if differs from series.fill (for dynamic rendering optimization) */
_fill?: CanvasRenderingContext2D['fillStyle'];
/** stroke style, if differs from series.stroke (for dynamic rendering optimization) */
_stroke?: CanvasRenderingContext2D['strokeStyle'];
/** bitmap of whether the band clip should be applied to stroke, fill, or both */
flags?: number;
}

66
scripts/uPlot.js
View file

@ -4,7 +4,7 @@
*
* uPlot.js (μPlot)
* A small, fast chart for time series, lines, areas, ohlc & bars
* https://github.com/leeoniya/uPlot (v1.6.25)
* https://github.com/leeoniya/uPlot (v1.6.26)
*/
const FEAT_TIME = true;
@ -2409,7 +2409,14 @@ function bars(opts) {
else
barWid = valToPosX(sizes[0], scaleX, xDim, xOff) - valToPosX(0, scaleX, xDim, xOff); // assumes linear scale (delta from 0)
barWid = pxRound(barWid - strokeWidth);
if (strokeWidth >= barWid)
strokeWidth = 0;
// for small gaps, disable pixel snapping since gap inconsistencies become noticible and annoying
// if (gapWid + extraGap < 5)
// pxRound = retArg0;
barWid = pxRound(clamp(barWid - strokeWidth, minWidth, maxWidth)); // TODO: extraGap?
xShift = (_dirX == 1 ? -strokeWidth / 2 : barWid + strokeWidth / 2);
}
@ -2440,14 +2447,23 @@ function bars(opts) {
let gapWid = colWid * gapFactor;
barWid = pxRound(min(maxWidth, max(minWidth, colWid - gapWid)) - strokeWidth - extraGap);
barWid = colWid - gapWid - extraGap;
if (strokeWidth >= barWid)
strokeWidth = 0;
// for small gaps, disable pixel snapping since gap inconsistencies become noticible and annoying
if (gapWid + extraGap < 5)
pxRound = retArg0;
barWid = pxRound(clamp(colWid - gapWid, minWidth, maxWidth) - strokeWidth - extraGap);
xShift = (align == 0 ? barWid / 2 : align == _dirX ? 0 : barWid) - align * _dirX * extraGap / 2;
// when colWidth is smaller than [min-clamped] bar width (e.g. aligned data values are non-uniform)
// disable clipping of null-valued band bars to avoid clip overlap / bleed into adjacent bars
// (this could still bleed clips of adjacent band/stacked bars into each other, so is far from perfect)
if (barWid > colWid)
if (barWid + strokeWidth > colWid)
bandClipNulls = false;
}
@ -2547,6 +2563,10 @@ function bars(opts) {
if (strokeWidth > 0)
_paths.stroke = multiPath ? strokePaths : stroke;
else if (!multiPath) {
_paths._fill = series._stroke ?? series._fill;
_paths.width = 0;
}
_paths.fill = multiPath ? fillPaths : stroke;
@ -3953,9 +3973,14 @@ function uPlot(opts, data, then) {
function drawSeries() {
if (dataLen > 0) {
series.forEach((s, i) => {
if (i > 0 && s.show && s._paths == null) {
let _idxs = mode == 2 ? [0, data[i][0].length - 1] : getOuterIdxs(data[i]);
s._paths = s.paths(self, i, _idxs[0], _idxs[1]);
if (i > 0 && s.show) {
cacheStrokeFill(i, false);
cacheStrokeFill(i, true);
if (s._paths == null) {
let _idxs = mode == 2 ? [0, data[i][0].length - 1] : getOuterIdxs(data[i]);
s._paths = s.paths(self, i, _idxs[0], _idxs[1]);
}
}
});
@ -3964,15 +3989,10 @@ function uPlot(opts, data, then) {
if (ctxAlpha != s.alpha)
ctx.globalAlpha = ctxAlpha = s.alpha;
{
cacheStrokeFill(i, false);
s._paths && drawPath(i, false);
}
s._paths != null && drawPath(i, false);
{
cacheStrokeFill(i, true);
let _gaps = s._paths ? s._paths.gaps : null;
let _gaps = s._paths != null ? s._paths.gaps : null;
let show = s.points.show(self, i, i0, i1, _gaps);
let idxs = s.points.filter(self, i, show, _gaps);
@ -4002,12 +4022,20 @@ function uPlot(opts, data, then) {
function drawPath(si, _points) {
let s = _points ? series[si].points : series[si];
let strokeStyle = s._stroke;
let fillStyle = s._fill;
let {
stroke,
fill,
clip: gapsClip,
flags,
_stroke: strokeStyle = s._stroke,
_fill: fillStyle = s._fill,
_width: width = s.width,
} = s._paths;
width = roundDec(width * pxRatio, 3);
let { stroke, fill, clip: gapsClip, flags } = s._paths;
let boundsClip = null;
let width = roundDec(s.width * pxRatio, 3);
let offset = (width % 2) / 2;
if (_points && fillStyle == null)
@ -5673,7 +5701,7 @@ function uPlot(opts, data, then) {
else
autoScaleX();
shouldSetSelect = select.show;
shouldSetSelect = select.show && (select.width > 0 || select.height > 0);
shouldSetCursor = shouldSetLegend = true;
_setSize(opts.width, opts.height);