@rokkit/chart 1.0.0-next.36 → 1.0.0-next.37

package/src/plots/FunnelPlot.svelte

@@ -1,7 +1,7 @@
 <script>
 	import { getContext } from 'svelte'
-	import { compact } from '../components/lib/utils'
-	import { funnel } from '../components/lib/funnel'
+	import { compact } from '../lib/utils-2'
+	import { funnel } from '../lib/funnel'
 
 	const chart = getContext('chart')
 
@@ -13,7 +13,6 @@
 
 	$: aes = { ...$chart.aes, ...compact({ x, y, fill, stat, curve }) }
 	$: data = funnel($chart.data, aes, $chart.width, $chart.height)
-
 </script>
 
 {#each data.stats as stat, i}

package/src/plots/HeatMapCalendar.svelte

@@ -1,5 +1,5 @@
 <script>
-	import { summarize, heatmap } from './heatmap'
+	import { summarize, heatmap } from '../lib/heatmap'
 	import { interpolateHsl } from 'd3-interpolate'
 	import { scaleLinear } from 'd3-scale'
 	// import ContinuousLegend from '../elements/ContinuousLegend.svelte'

package/src/plots/LinePlot.svelte

@@ -1,6 +1,6 @@
 <script>
 	import { getContext } from 'svelte'
-	import { colorBrewer } from '../lib/colors'
+	import { colorBrewer } from '../lib/palette'
 
 	let chart = getContext('chart')
 

package/src/plots/Plot.svelte

@@ -2,7 +2,7 @@
 	import { aggregate, getScales } from '../lib/utils'
 
 	import BoxPlot from './BoxPlot.svelte'
-	import ScatterPlot from './old_ScatterPlot.svelte'
+	import ScatterPlot from './ScatterPlot.svelte'
 
 	export let data
 	export let width

package/src/plots/ScatterPlot.svelte

@@ -1,6 +1,6 @@
 <script>
 	import { clamp } from 'yootils'
-	import Symbol from '../chart/Symbol.svelte'
+	import {Symbol} from '@rokkit/molecules'
 	import { getContext } from 'svelte'
 
 	const chart = getContext('chart')

package/src/chart/Symbol.svelte

@@ -1,40 +0,0 @@
-<script>
-	import { namedShapes } from '../components/lib/shape'
-
-	export let x = 0
-	export let y = 0
-	export let size = 10
-	export let fill = 'none'
-	export let stroke = 'currentColor'
-	export let thickness = 0.5
-
-	export let name = null
-	export let shape = null
-
-	$: x = x - size / 2
-	$: y = y - size / 2
-
-	$: d =
-		typeof shape === 'function'
-			? shape(size)
-			: (shape || name) in namedShapes
-			? namedShapes[shape || name](size)
-			: namedShapes.circle(size)
-</script>
-
-<!-- svelte-ignore a11y-click-events-have-key-events -->
-<path
-	{d}
-	{fill}
-	{stroke}
-	transform="translate({x},{y})"
-	stroke-width={thickness}
-	fill-rule="evenodd"
-	on:click
-	on:mouseover
-	on:mouseleave
-	on:focus
-	role="option"
-	aria-selected={false}
-	tabindex="0"
-/>

package/src/chart.js

@@ -1,11 +0,0 @@
-// export function scales(data, aes, opts) {
-// 	const { x, y } = aes
-// 	const { width, height, flipCoords } = {
-// 		width: 800,
-// 		height: 600,
-// 		flipCoords: false,
-// 		...opts
-// 	}
-
-// 	return { x, y, width, height, flipCoords }
-// }

package/src/components/index.js

@@ -1,2 +0,0 @@
-export { toHexString, initCap, uniqueId, toNested } from './lib/utils'
-export { brewer, uniques, slidingWindow, colors } from './lib/index'

package/src/components/lib/index.js

@@ -1,19 +0,0 @@
-import { ChartBrewer } from './chart'
-import { ColorBrewer } from './color'
-import { ShapeBrewer } from './shape'
-import { ThemeBrewer } from './theme'
-import { PatternBrewer } from './pattern'
-
-export { toHexString, swatch } from './utils'
-export { uniques, slidingWindow } from './rollup'
-export { colors } from './color'
-
-export function brewer() {
-	return {
-		pattern: () => new PatternBrewer(),
-		color: () => new ColorBrewer(),
-		theme: () => new ThemeBrewer(),
-		shape: () => new ShapeBrewer(),
-		chart: (data, x, y) => new ChartBrewer(data, x, y)
-	}
-}

package/src/components/lib/shape.js

@@ -1,199 +0,0 @@
-import { ColorBrewer } from './color'
-
-export const namedShapes = {
-	square: (s) =>
-		`M${0.1 * s} 0` +
-		`A${0.1 * s} ${0.1 * s} 0 0 0 0 ${0.1 * s}V${0.9 * s}` +
-		`A${0.1 * s} ${0.1 * s} 0 0 0 ${0.1 * s} ${s}H${0.9 * s}` +
-		`A${0.1 * s} ${0.1 * s} 0 0 0 ${s} ${0.9 * s}V${0.1 * s}` +
-		`A${0.1 * s} ${0.1 * s} 0 0 0 ${0.9 * s} 0Z`,
-	circle: (s) =>
-		`M0 ${0.5 * s}` +
-		`A${0.5 * s} ${0.5 * s} 0 0 0 ${s} ${0.5 * s}` +
-		`A${0.5 * s} ${0.5 * s} 0 0 0 0 ${0.5 * s}`,
-	diamond: (s) =>
-		`M${0.5 * s} 0` +
-		`A${0.6 * s} ${0.6 * s} 0 0 0 ${s} ${0.5 * s}` +
-		`A${0.6 * s} ${0.6 * s} 0 0 0 ${0.5 * s} ${s}` +
-		`A${0.6 * s} ${0.6 * s} 0 0 0 0 ${0.5 * s}` +
-		`A${0.6 * s} ${0.6 * s} 0 0 0 ${0.5 * s} 0`,
-	triangle: (s) =>
-		`M${0.5 * s} ${0.0866 * s}L0 ${0.9234 * s}L${s} ${0.9234 * s}Z`,
-	rhombus: (s) =>
-		`M${0.5 * s} 0` +
-		`L${s} ${0.5 * s}` +
-		`L${0.5 * s} ${s}` +
-		`L0 ${0.5 * s}Z`,
-	star: (s) =>
-		`M${0.5 * s} ${0.05 * s}` +
-		`L${0.606 * s} ${0.36 * s}` +
-		`L${s} ${0.36 * s}` +
-		`L${0.685 * s} ${0.59 * s}` +
-		`L${0.81 * s} ${0.95 * s}` +
-		`L${0.5 * s} ${0.725 * s}` +
-		`L${0.19 * s} ${0.95 * s}` +
-		`L${0.315 * s} ${0.59 * s}` +
-		`L0 ${0.36 * s}` +
-		`L${0.394 * s} ${0.36 * s}Z`,
-	heart: (s) =>
-		`M${0.9 * s} ${0.5 * s}` +
-		`A${0.08 * s} ${0.08 * s} 0 0 0 ${0.5 * s} ${0.2 * s}` +
-		`A${0.08 * s} ${0.08 * s} 0 0 0 ${0.1 * s} ${0.5 * s}` +
-		`L${0.5 * s} ${0.9 * s}` +
-		`L${0.9 * s} ${0.5 * s}`,
-	shurikan: (s) =>
-		`M${0.3 * s} ${0.1 * s}L${0.5 * s} 0L${0.7 * s} ${0.1 * s}` +
-		`A ${0.05 * s} ${0.05 * s} 0 0 0 ${0.9 * s} ${0.35 * s}` +
-		`L${s} ${0.5 * s}L${0.9 * s} ${0.7 * s}` +
-		`A ${0.05 * s} ${0.05 * s} 0 0 0 ${0.7 * s} ${0.9 * s}` +
-		`L${0.5 * s} ${s}L${0.3 * s} ${0.9 * s}` +
-		`A${0.05 * s} ${0.05 * s} 0 0 0 ${0.1 * s} ${0.7 * s}` +
-		`L0 ${0.5 * s}L${0.1 * s} ${0.3 * s}` +
-		`A${0.05 * s} ${0.05 * s} 0 0 0 ${0.3 * s} ${0.1 * s}` +
-		`M${0.4 * s} ${0.5 * s}` +
-		`A${0.1 * s} ${0.1 * s} 0 0 0 ${0.6 * s} ${0.5 * s}` +
-		`A${0.1 * s} ${0.1 * s} 0 0 0 ${0.4 * s} ${0.5 * s}`,
-	target: (s) =>
-		`M${0.2 * s} ${0.5 * s}` +
-		`A${0.3 * s} ${0.3 * s} 0 0 0 ${0.8 * s} ${0.5 * s}` +
-		`A${0.3 * s} ${0.3 * s} 0 0 0 ${0.2 * s} ${0.5 * s}` +
-		`M0 ${0.5 * s}` +
-		`L${s} ${0.5 * s}` +
-		`M${0.5 * s} 0` +
-		`L${0.5 * s} ${s}`
-}
-
-export const builtIn = [
-	...Object.keys(namedShapes).map((key) => ({ shape: namedShapes[key] })),
-	{
-		shape: (s) =>
-			`M${0.1 * s} ${0.1 * s}` +
-			`A${0.5 * s} ${0.5 * s} 0 0 0 ${0.9 * s} ${0.1 * s}` +
-			`A${0.5 * s} ${0.5 * s} 0 0 0 ${0.9 * s} ${0.9 * s}` +
-			`A${0.5 * s} ${0.5 * s} 0 0 0 ${0.1 * s} ${0.9 * s}` +
-			`A${0.5 * s} ${0.5 * s} 0 0 0 ${0.1 * s} ${0.1 * s}`
-	},
-	{
-		shape: (s) =>
-			`M${0.5 * s} ${0.3 * s}` +
-			`A${0.2 * s} ${0.1 * s} 0 0 0 ${0.5 * s} ${0.1 * s}` +
-			`L${0.5 * s} ${0.9 * s}` +
-			`M${0.5 * s} ${0.7 * s}` +
-			`A${0.2 * s} ${0.1 * s} 0 0 0 ${0.5 * s} ${0.9 * s}` +
-			`M${0.3 * s} ${0.5 * s}` +
-			`A${0.1 * s} ${0.2 * s} 0 0 0 ${0.1 * s} ${0.5 * s}` +
-			`L${0.9 * s} ${0.5 * s}` +
-			`M${0.7 * s} ${0.5 * s}` +
-			`A${0.1 * s} ${0.2 * s} 0 0 0 ${0.9 * s} ${0.5 * s}`
-	},
-	{
-		shape: (s) =>
-			`M${0.1 * s} ${0.3 * s}` +
-			`L${0.7 * s} ${0.9 * s}` +
-			`L${0.9 * s} ${0.7 * s}` +
-			`L${0.3 * s} ${0.1 * s}Z` +
-			`M${0.1 * s} ${0.7 * s}` +
-			`L${0.7 * s} ${0.1 * s}` +
-			`L${0.9 * s} ${0.3 * s}` +
-			`L${0.3 * s} ${0.9 * s}Z`
-	},
-	{
-		shape: (s) =>
-			`M${0.1 * s} ${0.4 * s}` +
-			`L${0.9 * s} ${0.4 * s}` +
-			`L${0.9 * s} ${0.6 * s}` +
-			`L${0.1 * s} ${0.6 * s}Z` +
-			`M${0.4 * s} ${0.1 * s}` +
-			`L${0.4 * s} ${0.9 * s}` +
-			`L${0.6 * s} ${0.9 * s}` +
-			`L${0.6 * s} ${0.1 * s}Z`
-	},
-	{
-		shape: (s) =>
-			`M${0.5 * s} ${0.05 * s}` +
-			`L${0.19 * s} ${0.95 * s}` +
-			`L${s} ${0.36 * s}` +
-			`L0 ${0.36 * s}` +
-			`L${0.81 * s} ${0.95 * s}Z`
-	},
-	{
-		shape: (s) =>
-			`M${0.1 * s} ${0.1 * s}` +
-			`L${0.1 * s} ${0.9 * s}` +
-			`L${0.9 * s} ${0.9 * s}` +
-			`L${0.9 * s} ${0.1 * s}Z` +
-			`M${0.1 * s} ${0.1 * s}` +
-			`L${0.1 * s} ${0.5 * s}` +
-			`L${0.5 * s} ${0.5 * s}` +
-			`L${0.5 * s} ${0.1 * s}Z` +
-			`M${0.5 * s} ${0.5 * s}` +
-			`L${0.5 * s} ${0.9 * s}` +
-			`L${0.9 * s} ${0.9 * s}` +
-			`L${0.9 * s} ${0.5 * s}Z`
-	},
-	{
-		shape: (s) =>
-			`M${0.5 * s} 0` +
-			`L${s} ${0.5 * s}` +
-			`L${0.5 * s} ${s}` +
-			`L0 ${0.5 * s}Z` +
-			`M${0.5 * s} 0` +
-			`L${s} ${0.5 * s}` +
-			`L${0.5 * s} ${s}Z`
-	},
-	{
-		shape: (s) =>
-			`M0 ${0.5 * s}` +
-			`A${0.6 * s} ${0.4 * s} 0 0 0 ${s} ${0.5 * s}` +
-			`A${0.6 * s} ${0.4 * s} 0 0 0 0 ${0.5 * s}` +
-			`M${0.5 * s} 0` +
-			`A${0.4 * s} ${0.6 * s} 0 0 0 ${0.5 * s} ${s}` +
-			`A${0.4 * s} ${0.6 * s} 0 0 0 ${0.5 * s} 0`
-	}
-]
-
-export class ShapeBrewer {
-	constructor() {
-		this.shapes = builtIn
-		this.repeat = false
-		this.indices = [...this.shapes.keys()]
-		this.gray = new ColorBrewer().gray()
-		this.shades = []
-		this.repeat = false
-	}
-
-	clear() {
-		this.shapes = []
-		return this
-	}
-
-	add(shape) {
-		const shapes = Array.isArray(shape) ? shape : [shape]
-		this.shapes = [...shapes]
-
-		return this
-	}
-
-	filter(indices) {
-		indices = Array.isArray(indices) ? indices : [indices]
-		this.indices = indices.filter((i) => i > 0 && i < this.shapes.length)
-
-		return this
-	}
-
-	colors(shades, repeat = false) {
-		this.shades = Array.isArray(shades) ? shades : [shades]
-		this.repeat = repeat
-		return this
-	}
-
-	brew() {
-		return this.indices
-			.map((i) => this.shapes[i])
-			.map((shape, i) => {
-				return i < this.shades.length || this.repeat
-					? { ...shape, ...this.shades[i % this.shades.length] }
-					: { ...shape, ...this.gray }
-			})
-	}
-}

package/src/components/lib/timer.js

@@ -1,41 +0,0 @@
-import { writable } from 'svelte/store'
-
-let req
-let prev
-const elapsed = writable(0)
-
-const tick = (timestamp) => {
-	if (!prev) prev = timestamp
-	const diff = Math.round(timestamp - prev)
-	prev = timestamp
-	elapsed.update((e) => e + diff)
-	req = window.requestAnimationFrame(tick)
-}
-
-const timer = {
-	start() {
-		if (typeof window === 'undefined') return
-		else if (!req) {
-			prev = null
-			req = window.requestAnimationFrame(tick)
-		}
-	},
-	stop() {
-		if (typeof window === 'undefined') return
-		else if (req) {
-			window.cancelAnimationFrame(req)
-			req = null
-		}
-	},
-	toggle() {
-		req ? timer.stop() : timer.start()
-	},
-	set(val) {
-		if (typeof val === 'number') elapsed.set(val)
-	},
-	reset() {
-		timer.set(0)
-	}
-}
-
-export { timer, elapsed }

package/src/constants.js

@@ -1,66 +0,0 @@
-export const __muted__ = {
-	color: '#eeeeee',
-	fill: 'empty',
-	shape: 'circle'
-}
-export const __colors__ = [
-	'#FFDE6B',
-	'#EF89EE',
-	'#F79F1E',
-	'#02B8FF',
-	'#9F84EC',
-	'#15CBC4',
-	'#0092FD',
-	'#F63A57',
-	'#A2CB39',
-	'#FF6E2F',
-	'#FEB8B9',
-	'#af7aa1',
-	'#7EFFF5'
-]
-
-export const __patterns__ = {
-	A: 'M0 5A6 6 0 0 0 10 5',
-	B: 'M0 10L10 0',
-	C: 'M0 0A10 10 0 0 0 10 10',
-	D: 'M0 0L10 10',
-	E: 'M10 5A6 6 0 0 0 0 5',
-	F: 'M10 10A10 10 0 0 0 0 0',
-	G: 'M0 0L10 10ZM10 0L0 10Z',
-	H: 'M1 1L9 1L9 9L1 9Z',
-	I: 'M4 0L4 10M6 10L6 0M0 4L10 4M10 6L0 6',
-	J: 'M0 2L8 10M2 0L10 8M0 8L8 0M2 10L10 2',
-	K: 'M5 1A 4 4 0 0 0 9 5A4 4 0 0 0 5 9A4 4 0 0 0 1 5A4 4 0 0 0 5 1',
-	L: 'M1 3L7 9M3 1L9 7M1 7L7 1M3 9L9 3',
-	M: 'M2 2A4 4 0 0 0 8 2A4 4 0 0 0 8 8A4 4 0 0 0 2 8A4 4 0 0 0 2 2',
-	N: 'M0 0A5 5 0 0 0 10 0A5 5 0 0 0 10 10A5 5 0 0 0 0 10A5 5 0 0 0 0 0',
-	O: 'M5 2A 3 3 0 0 0 8 5A3 3 0 0 0 5 8A3 3 0 0 0 2 5A3 3 0 0 0 5 2',
-	P: 'M2 5L5 2L8 5L5 8Z',
-	Q: 'M3 5A2 2 0 0 0 7 5A2 2 0 0 0 3 5M1 5L9 5M5 1L5 9',
-	R: 'M2 8L8 2ZM1.5 3.5L3.5 1.5ZM6.5 8.5L8.5 6.5ZM0 0L10 10Z',
-	S:
-		'M2 8L8 2ZM1.5 3.5L3.5 1.5Z' +
-		'M6.5 8.5L8.5 6.5Z' +
-		'M2 2L8 8M1.5 6.5L3.5 8.5' +
-		'M6.5 1.5L8.5 3.5',
-	T:
-		'M5 1 A6 6 0 0 0 5 9' +
-		'A6 6 0 0 0 5 1' +
-		'M1 5A6 6 0 0 0 9 5A6 6 0 0 0 1 5',
-	U:
-		'M1.5 5A1 1 0 0 0 3.5 5A1 1 0 0 0 1.5 5' +
-		'M6.5 5A1 1 0 0 0 8.5 5A1 1 0 0 0 6.5 5' +
-		'M5 1.5A1 1 0 0 0 5 3.5A1 1 0 0 0 5 1.5' +
-		'M5 6.5A1 1 0 0 0 5 8.5A1 1 0 0 0 5 6.5',
-	V:
-		'M1.5 2.5A1 1 0 0 0 3.5 2.5A1 1 0 0 0 1.5 2.5' +
-		'M6.5 2.5A1 1 0 0 0 8.5 2.5A1 1 0 0 0 6.5 2.5' +
-		'M2.5 6.5A1 1 0 0 0 2.5 8.5A1 1 0 0 0 2.5 6.5' +
-		'M7.5 6.5A1 1 0 0 0 7.5 8.5A1 1 0 0 0 7.5 6.5' +
-		'M3.5 5A1 1 0 0 0 6.5 5A1 1 0 0 0 3.5 5',
-	W: 'M5 0L6 4L10 5L6 6L5 10L4 6L0 5L4 4Z' + 'M2 1V3M1 2H3' + 'M8 9V7M9 8H7',
-	X: 'M5 2L2.5 9L8.8 4.6L1.2 4.6L7.5 9Z',
-	Y: 'M0 5A5 5 0 0 0 5 0' + 'M5 10A5 5 0 0 0 0 5' + 'M5 10A5 5 0 0 0 5 0',
-	Z: 'M0 0L10 10M5 0L10 5M0 5 L5 10',
-	Z1: 'M0 0L10 10M3 0L10 7M0 7 L3 10'
-}

package/src/elements/PatternDefs.svelte

@@ -1,13 +0,0 @@
-<script>
-	import PatternMask from './PatternMask.svelte'
-	const size = 10
-
-	export let thickness = 0.5
-	export let patterns
-</script>
-
-<defs>
-	{#each patterns as pattern}
-		<PatternMask {...pattern} {thickness} {size} />
-	{/each}
-</defs>

package/src/elements/PatternMask.svelte

@@ -1,20 +0,0 @@
-<script>
-	export let id
-	// export let fill
-	export let path
-	// export let contrast
-	export let thickness = 0.5
-	export let patternUnits = 'userSpaceOnUse'
-	export let size = 10
-</script>
-
-<pattern id="p-{id}" {patternUnits} width={size} height={size}>
-	{#if path}
-		<path d={path} fill="none" stroke="white" stroke-width={thickness} />
-		<!-- {:else}
-	<rect width={size} height={size} {fill} /> -->
-	{/if}
-</pattern>
-<mask {id}>
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#p-{id})" />
-</mask>

package/src/elements/Symbol.svelte

@@ -1,38 +0,0 @@
-<script>
-	// import { namedShapes } from '../lib/shape'
-	import { swatchStore } from '../swatch'
-
-	export let x = 0
-	export let y = 0
-	export let size = 10
-	export let fill = 'none'
-	export let stroke = 'currentColor'
-	export let thickness = 0.5
-
-	export let name = 'circle'
-	// export let shape = null
-
-	$: x = x - size / 2
-	$: y = y - size / 2
-
-	$: d = $swatchStore['shapes'][name](size)
-	// typeof shape === 'function'
-	// 	? shape(size)
-	// 	: (shape || name) in namedShapes
-	// 	? namedShapes[shape || name](size)
-	// 	: namedShapes.circle(size)
-</script>
-
-<!-- svelte-ignore a11y-click-events-have-key-events -->
-<path
-	{d}
-	{fill}
-	{stroke}
-	transform="translate({x},{y})"
-	stroke-width={thickness}
-	fill-rule="evenodd"
-	on:click
-	on:mouseover
-	on:mouseleave
-	on:focus
-/>

package/src/funnel.svelte

@@ -1,35 +0,0 @@
-<!-- <script context="module">
-	/**
-	 * @type {import('@sveltejs/kit').Load}
-	 */
-	export async function load({ page, fetch, session, stuff }) {
-		const url = '/api/data/funnel'
-		const response = await fetch(url)
-
-		if (response.ok) {
-			let result = await response.json()
-
-			return {
-				props: { data: result }
-			}
-		}
-
-		return {
-			status: response.status,
-			error: new Error(`Could not load ${url}`)
-		}
-	}
-</script> -->
-
-<script>
-	import { FunnelPlot, Chart } from '@rokkit/chart'
-	export let data
-
-	// let names = ['one', 'two', 'three'] // each one is a separate segment. max of Combined value at each stage is overall height/width
-	// let groups = ['a', 'b', 'c'] // each group should have a value. individual values are used for each band height
-</script>
-
-<h1>Funnel</h1>
-<Chart {data} width={1200}>
-	<FunnelPlot x="stage" y="count" fill="client" stat="sum" />
-</Chart>

package/src/geom.js

@@ -1,105 +0,0 @@
-import {
-	sum,
-	min,
-	max,
-	mean,
-	mode,
-	median,
-	deviation,
-	variance,
-	flatRollup
-} from 'd3-array'
-
-const summaries = {
-	identity: (value) => value,
-	count: (values) => values.length,
-	sum: (values) => sum(values),
-	min: (values) => min(values),
-	max: (values) => max(values),
-	mean: (values) => mean(values),
-	median: (values) => median(values),
-	mode: (values) => mode(values),
-	variance: (values) => variance(values),
-	deviation: (values) => deviation(values)
-}
-
-/**
- * Returns an aggregator function for an input string or function.
- *
- * @param {string|function} stat
- * @returns
- */
-export function rollup(stat) {
-	if (typeof stat === 'function') return stat
-	if (typeof stat !== 'string')
-		throw new TypeError('stat must be a string or function')
-	if (!(stat in summaries)) throw new TypeError('Unknown stat: ' + stat)
-
-	return summaries[stat]
-}
-
-/**
- * Aesthetics for a chart.
- *
- * @typedef Aesthetics
- * @property {string} x
- * @property {string} y
- * @property {string} [fill]
- * @property {string} [size]
- * @property {string} [color]
- * @property {string} [shape]
- * @property {string} [pattern]
- */
-
-/**
- *
- * @param {Array<any>} data
- * @param {Aesthetics} aes
- * @param {function|string} stat
- * @returns
- */
-export function aggregate(data, aes, stat = 'identity') {
-	const agg = rollup(stat)
-	const keys = ['color', 'fill', 'pattern', 'shape', 'size'].filter((k) =>
-		Object.keys(aes).includes(k)
-	)
-
-	let groups = keys.map((k) => (d) => d[aes[k]])
-
-	return flatRollup(
-		data,
-		(v) => agg(v.map((d) => d[aes.y])),
-		(d) => d[aes.x],
-		...groups
-	)
-}
-
-// export function geomBars(chart, aes) {
-// 	const { x, y, fill, color, pattern } = { ...aes, ...chart.aes }
-// 	return aggregate(chart.data, { x, y, fill, color, pattern })
-// }
-
-// export function geomLines(chart, aes) {
-// 	const { x, y, color } = { ...aes, ...chart.aes }
-// 	return aggregate(chart.data, { x, y, color })
-// }
-
-// export function geomViolin(chart, aes) {
-// 	const { x, y, fill, color, pattern } = { ...aes, ...chart.aes }
-// 	return { x, y, fill, color, pattern, ...opts }
-// }
-
-// export function geomArea(chart, aes) {
-// 	const { x, y, fill, color, pattern } = { ...aes, ...chart.aes }
-// 	return { x, y, fill, color, pattern, ...opts }
-// }
-
-// export function geomTrend(chart, aes) {
-// 	const { x, y, fill, color, pattern } = { ...aes, ...chart.aes }
-// 	return { x, y, fill, color, pattern, ...opts }
-// }
-
-// export function geomPoints(chart, aes) {
-// 	const { x, y, fill, color, shape, size } = { ...aes, ...chart.aes }
-// 	return { x, y, fill, color, shape, size, ...opts }
-// }