@uwdata/mosaic-sql 0.20.0 → 0.20.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/transforms/bin-histogram.d.ts.map +1 -1
- package/dist/src/transforms/bin-histogram.js +7 -2
- package/dist/src/transforms/bin-histogram.js.map +1 -1
- package/dist/src/transforms/util/time-interval.d.ts.map +1 -1
- package/dist/src/transforms/util/time-interval.js +3 -0
- package/dist/src/transforms/util/time-interval.js.map +1 -1
- package/package.json +2 -2
- package/src/transforms/bin-histogram.ts +8 -2
- package/src/transforms/util/time-interval.ts +4 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin-histogram.d.ts","sourceRoot":"","sources":["../../../src/transforms/bin-histogram.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"bin-histogram.d.ts","sourceRoot":"","sources":["../../../src/transforms/bin-histogram.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,OAAO,EAAE,KAAK,EAAkB,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,mBAAmB;IAClC,oCAAoC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EACxB,OAAO,GAAE,mBAAwB,EACjC,SAAS,GAAE,KAAK,CAAC,MAAM,CAAuC,GAC7D,QAAQ,CAmBV"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { float64 } from '../functions/cast.js';
|
|
2
2
|
import { floor } from '../functions/numeric.js';
|
|
3
3
|
import { add, div, mul, sub } from '../functions/operators.js';
|
|
4
|
+
import { asNode } from '../util/ast.js';
|
|
4
5
|
import { binSpec } from './util/bin-step.js';
|
|
5
6
|
import { scaleTransform } from './scales.js';
|
|
6
7
|
/**
|
|
@@ -15,14 +16,18 @@ import { scaleTransform } from './scales.js';
|
|
|
15
16
|
export function binHistogram(field, extent, options = {}, transform = scaleTransform({ type: 'linear' })) {
|
|
16
17
|
const [min, max] = extent;
|
|
17
18
|
const { offset = 0 } = options;
|
|
19
|
+
// handle degenerate extent
|
|
20
|
+
if (max === min)
|
|
21
|
+
return offset ? add(offset, field) : asNode(field);
|
|
18
22
|
const { apply, sqlApply, sqlInvert } = transform;
|
|
19
23
|
const b = binSpec(apply(min), apply(max), options);
|
|
20
24
|
const col = sqlApply(field);
|
|
21
|
-
const alpha = (b.max - b.min) / b.steps;
|
|
25
|
+
const alpha = ((b.max - b.min) / b.steps) || 1;
|
|
22
26
|
let expr = b.min === 0 ? col : sub(col, b.min);
|
|
23
27
|
if (alpha !== 1)
|
|
24
28
|
expr = div(expr, float64(alpha));
|
|
25
|
-
|
|
29
|
+
// add offset *after* floor to dodge nasty floating point nuances
|
|
30
|
+
expr = offset ? add(offset, floor(expr)) : floor(expr);
|
|
26
31
|
if (alpha !== 1)
|
|
27
32
|
expr = mul(alpha, expr);
|
|
28
33
|
if (b.min !== 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin-histogram.js","sourceRoot":"","sources":["../../../src/transforms/bin-histogram.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAS,cAAc,EAAE,MAAM,aAAa,CAAC;AA0BpD;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAC1B,KAAgB,EAChB,MAAwB,EACxB,UAA+B,EAAE,EACjC,YAA2B,cAAc,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAE;IAE9D,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"bin-histogram.js","sourceRoot":"","sources":["../../../src/transforms/bin-histogram.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAS,cAAc,EAAE,MAAM,aAAa,CAAC;AA0BpD;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAC1B,KAAgB,EAChB,MAAwB,EACxB,UAA+B,EAAE,EACjC,YAA2B,cAAc,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAE;IAE9D,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAE/B,2BAA2B;IAC3B,IAAI,GAAG,KAAK,GAAG;QAAE,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEpE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;IACjD,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5B,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE/C,IAAI,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,KAAK,KAAK,CAAC;QAAE,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAClD,iEAAiE;IACjE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,KAAK,KAAK,CAAC;QAAE,IAAI,GAAG,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;QAAE,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACzC,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time-interval.d.ts","sourceRoot":"","sources":["../../../../src/transforms/util/time-interval.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,aAAa,GAAG,IAAI,GAAG,MAAM,CAAC;AAE1C,MAAM,MAAM,QAAQ,GAChB,MAAM,GACN,SAAS,GACT,OAAO,GACP,KAAK,GACL,MAAM,GACN,QAAQ,GACR,QAAQ,GACR,aAAa,GACb,aAAa,CAAC;AAuClB;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,MAAM,GACZ,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"time-interval.d.ts","sourceRoot":"","sources":["../../../../src/transforms/util/time-interval.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,aAAa,GAAG,IAAI,GAAG,MAAM,CAAC;AAE1C,MAAM,MAAM,QAAQ,GAChB,MAAM,GACN,SAAS,GACT,OAAO,GACP,KAAK,GACL,MAAM,GACN,QAAQ,GACR,QAAQ,GACR,aAAa,GACb,aAAa,CAAC;AAuClB;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,MAAM,GACZ,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAuBpC"}
|
|
@@ -42,6 +42,9 @@ const units = [
|
|
|
42
42
|
*/
|
|
43
43
|
export function timeInterval(min, max, steps) {
|
|
44
44
|
const span = +max - +min;
|
|
45
|
+
// if degenerate span, default to one day
|
|
46
|
+
if (span === 0)
|
|
47
|
+
return { unit: DAY, step: 1 };
|
|
45
48
|
const t = span / steps; // target step size duration
|
|
46
49
|
const i = bisect(units, t, v => v.dt);
|
|
47
50
|
let unit;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time-interval.js","sourceRoot":"","sources":["../../../../src/transforms/util/time-interval.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"time-interval.js","sourceRoot":"","sources":["../../../../src/transforms/util/time-interval.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@uwdata/mosaic-sql",
|
|
3
|
-
"version": "0.20.
|
|
3
|
+
"version": "0.20.1",
|
|
4
4
|
"description": "SQL query construction and analysis.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"sql",
|
|
@@ -29,5 +29,5 @@
|
|
|
29
29
|
"test": "vitest run",
|
|
30
30
|
"prepublishOnly": "npm run test && npm run lint && tsc --build"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "1e093fdf1bd1f1300d64ed2c4f7efcec74218048"
|
|
33
33
|
}
|
|
@@ -3,6 +3,7 @@ import type { ExprValue } from '../types.js';
|
|
|
3
3
|
import { float64 } from '../functions/cast.js';
|
|
4
4
|
import { floor } from '../functions/numeric.js';
|
|
5
5
|
import { add, div, mul, sub } from '../functions/operators.js';
|
|
6
|
+
import { asNode } from '../util/ast.js';
|
|
6
7
|
import { binSpec } from './util/bin-step.js';
|
|
7
8
|
import { Scale, scaleTransform } from './scales.js';
|
|
8
9
|
|
|
@@ -47,14 +48,19 @@ export function binHistogram(
|
|
|
47
48
|
): ExprNode {
|
|
48
49
|
const [min, max] = extent;
|
|
49
50
|
const { offset = 0 } = options;
|
|
51
|
+
|
|
52
|
+
// handle degenerate extent
|
|
53
|
+
if (max === min) return offset ? add(offset, field) : asNode(field);
|
|
54
|
+
|
|
50
55
|
const { apply, sqlApply, sqlInvert } = transform;
|
|
51
56
|
const b = binSpec(apply(min), apply(max), options);
|
|
52
57
|
const col = sqlApply(field);
|
|
53
|
-
const alpha = (b.max - b.min) / b.steps;
|
|
58
|
+
const alpha = ((b.max - b.min) / b.steps) || 1;
|
|
54
59
|
|
|
55
60
|
let expr = b.min === 0 ? col : sub(col, b.min);
|
|
56
61
|
if (alpha !== 1) expr = div(expr, float64(alpha));
|
|
57
|
-
|
|
62
|
+
// add offset *after* floor to dodge nasty floating point nuances
|
|
63
|
+
expr = offset ? add(offset, floor(expr)) : floor(expr);
|
|
58
64
|
if (alpha !== 1) expr = mul(alpha, expr);
|
|
59
65
|
if (b.min !== 0) expr = add(b.min, expr);
|
|
60
66
|
return sqlInvert(expr);
|
|
@@ -63,6 +63,10 @@ export function timeInterval(
|
|
|
63
63
|
steps: number
|
|
64
64
|
): ({ unit: TimeUnit, step: number }) {
|
|
65
65
|
const span = +max - +min;
|
|
66
|
+
|
|
67
|
+
// if degenerate span, default to one day
|
|
68
|
+
if (span === 0) return { unit: DAY, step: 1 };
|
|
69
|
+
|
|
66
70
|
const t = span / steps; // target step size duration
|
|
67
71
|
const i = bisect(units, t, v => v.dt);
|
|
68
72
|
|