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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rokkit/chart",
-  "version": "1.0.0-next.37",
+  "version": "1.0.0-next.39",
   "description": "Components for making interactive charts.",
   "author": "Jerry Thomas <me@jerrythomas.name>",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "typescript": "^5.1.6",
     "vite": "^4.4.7",
     "vitest": "~0.33.0",
-    "shared-config": "1.0.0-next.37"
+    "shared-config": "1.0.0-next.39"
   },
   "dependencies": {
     "d3-array": "^3.2.4",
@@ -35,9 +35,10 @@
     "date-fns": "^2.30.0",
     "ramda": "^0.29.0",
     "yootils": "^0.3.1",
-    "@rokkit/core": "1.0.0-next.37",
-    "@rokkit/stores": "1.0.0-next.37",
-    "@rokkit/molecules": "1.0.0-next.37"
+    "@rokkit/core": "1.0.0-next.39",
+    "@rokkit/molecules": "1.0.0-next.39",
+    "@rokkit/atoms": "1.0.0-next.39",
+    "@rokkit/stores": "1.0.0-next.39"
   },
   "files": [
     "src/**/*.js",

package/src/chart/Chart.svelte

@@ -1,7 +1,7 @@
 <script>
 	import { setContext } from 'svelte'
 	import { writable } from 'svelte/store'
-	import { compact } from '../lib/utils'
+	import { compact } from '@rokkit/core'
 	import { builtIn } from '../lib/theme'
 
 	let chart = writable({})

package/src/lib/axis.js

@@ -1,11 +1,13 @@
+function getOrigin(scale, axis) {
+	const origin = scale[axis].ticks
+		? scale(Math.max(0, Math.min(...scale[axis].domain())))
+		: scale[axis].range()[0]
+	return origin
+}
 export function axis(scale) {
 	const origin = {
-		x: scale.x.ticks
-			? scale.x(Math.max(0, Math.min(...scale.x.domain())))
-			: scale.x.range()[0],
-		y: scale.y.ticks
-			? scale.y(Math.max(0, Math.min(...scale.y.domain())))
-			: scale.y.range()[0]
+		x: getOrigin(scale, 'x'),
+		y: getOrigin(scale, 'y')
 	}
 	const ticks = {
 		x: axisTicks(scale.x, { axis: 'x', origin }),

package/src/lib/constants.js

@@ -1,3 +1,8 @@
+import patterns__ from './patterns.json'
+import __palette from './palette.json'
+
+export const __patterns__ = patterns__
+export const palette = __palette
 export const __muted__ = {
 	color: '#eeeeee',
 	fill: 'empty',
@@ -19,52 +24,6 @@ export const __colors__ = [
 	'#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'
-}
-
 export const colors = [
 	'#FFDE6B',
 	'#EF89EE',
@@ -80,303 +39,3 @@ export const colors = [
 	'#af7aa1',
 	'#7EFFF5'
 ]
-export const palette = {
-	indigo: {
-		50: '#eef2ff',
-		100: '#e0e7ff',
-		200: '#c7d2fe',
-		300: '#a5b4fc',
-		400: '#818cf8',
-		500: '#6366f1',
-		600: '#4f46e5',
-		700: '#4338ca',
-		800: '#3730a3',
-		900: '#312e81'
-	},
-	blue: {
-		50: '#eff6ff',
-		100: '#dbeafe',
-		200: '#bfdbfe',
-		300: '#93c5fd',
-		400: '#60a5fa',
-		500: '#3b82f6',
-		600: '#2563eb',
-		700: '#1d4ed8',
-		800: '#1e40af',
-		900: '#1e3a8a'
-	},
-	sky: {
-		50: '#f0f9ff',
-		100: '#e0f2fe',
-		200: '#bae6fd',
-		300: '#7dd3fc',
-		400: '#38bdf8',
-		500: '#0ea5e9',
-		600: '#0284c7',
-		700: '#0369a1',
-		800: '#075985',
-		900: '#0c4a6e'
-	},
-	cyan: {
-		50: '#ecfeff',
-		100: '#cffafe',
-		200: '#a5f3fc',
-		300: '#67e8f9',
-		400: '#22d3ee',
-		500: '#06b6d4',
-		600: '#0891b2',
-		700: '#0e7490',
-		800: '#155e75',
-		900: '#164e63'
-	},
-	teal: {
-		50: '#f0fdfa',
-		100: '#ccfbf1',
-		200: '#99f6e4',
-		300: '#5eead4',
-		400: '#2dd4bf',
-		500: '#14b8a6',
-		600: '#0d9488',
-		700: '#0f766e',
-		800: '#115e59',
-		900: '#134e4a'
-	},
-	emerald: {
-		50: '#ecfdf5',
-		100: '#d1fae5',
-		200: '#a7f3d0',
-		300: '#6ee7b7',
-		400: '#34d399',
-		500: '#10b981',
-		600: '#059669',
-		700: '#047857',
-		800: '#065f46',
-		900: '#064e3b'
-	},
-	green: {
-		50: '#f0fdf4',
-		100: '#dcfce7',
-		200: '#bbf7d0',
-		300: '#86efac',
-		400: '#4ade80',
-		500: '#22c55e',
-		600: '#16a34a',
-		700: '#15803d',
-		800: '#166534',
-		900: '#14532d'
-	},
-	lime: {
-		50: '#f7fee7',
-		100: '#ecfccb',
-		200: '#d9f99d',
-		300: '#bef264',
-		400: '#a3e635',
-		500: '#84cc16',
-		600: '#65a30d',
-		700: '#4d7c0f',
-		800: '#3f6212',
-		900: '#365314'
-	},
-	yellow: {
-		50: '#fefce8',
-		100: '#fef9c3',
-		200: '#fef08a',
-		300: '#fde047',
-		400: '#facc15',
-		500: '#eab308',
-		600: '#ca8a04',
-		700: '#a16207',
-		800: '#854d0e',
-		900: '#713f12'
-	},
-	amber: {
-		50: '#fffbeb',
-		100: '#fef3c7',
-		200: '#fde68a',
-		300: '#fcd34d',
-		400: '#fbbf24',
-		500: '#f59e0b',
-		600: '#d97706',
-		700: '#b45309',
-		800: '#92400e',
-		900: '#78350f'
-	},
-	orange: {
-		50: '#fff7ed',
-		100: '#ffedd5',
-		200: '#fed7aa',
-		300: '#fdba74',
-		400: '#fb923c',
-		500: '#f97316',
-		600: '#ea580c',
-		700: '#c2410c',
-		800: '#9a3412',
-		900: '#7c2d12'
-	},
-	red: {
-		50: '#fef2f2',
-		100: '#fee2e2',
-		200: '#fecaca',
-		300: '#fca5a5',
-		400: '#f87171',
-		500: '#ef4444',
-		600: '#dc2626',
-		700: '#b91c1c',
-		800: '#991b1b',
-		900: '#7f1d1d'
-	},
-	rose: {
-		50: '#fff1f2',
-		100: '#ffe4e6',
-		200: '#fecdd3',
-		300: '#fda4af',
-		400: '#fb7185',
-		500: '#f43f5e',
-		600: '#e11d48',
-		700: '#be123c',
-		800: '#9f1239',
-		900: '#881337'
-	},
-	pink: {
-		50: '#fdf2f8',
-		100: '#fce7f3',
-		200: '#fbcfe8',
-		300: '#f9a8d4',
-		400: '#f472b6',
-		500: '#ec4899',
-		600: '#db2777',
-		700: '#be185d',
-		800: '#9d174d',
-		900: '#831843'
-	},
-	fuchsia: {
-		50: '#fdf4ff',
-		100: '#fae8ff',
-		200: '#f5d0fe',
-		300: '#f0abfc',
-		400: '#e879f9',
-		500: '#d946ef',
-		600: '#c026d3',
-		700: '#a21caf',
-		800: '#86198f',
-		900: '#701a75'
-	},
-	purple: {
-		50: '#faf5ff',
-		100: '#f3e8ff',
-		200: '#e9d5ff',
-		300: '#d8b4fe',
-		400: '#c084fc',
-		500: '#a855f7',
-		600: '#9333ea',
-		700: '#7e22ce',
-		800: '#6b21a8',
-		900: '#581c87'
-	},
-	violet: {
-		50: '#f5f3ff',
-		100: '#ede9fe',
-		200: '#ddd6fe',
-		300: '#c4b5fd',
-		400: '#a78bfa',
-		500: '#8b5cf6',
-		600: '#7c3aed',
-		700: '#6d28d9',
-		800: '#5b21b6',
-		900: '#4c1d95'
-	},
-	warmGray: {
-		50: '#fafaf9',
-		100: '#f5f5f4',
-		200: '#e7e5e4',
-		300: '#d6d3d1',
-		400: '#a8a29e',
-		500: '#78716c',
-		600: '#57534e',
-		700: '#44403c',
-		800: '#292524',
-		900: '#1c1917'
-	},
-	trueGray: {
-		50: '#fafafa',
-		100: '#f5f5f5',
-		200: '#e5e5e5',
-		300: '#d4d4d4',
-		400: '#a3a3a3',
-		500: '#737373',
-		600: '#525252',
-		700: '#404040',
-		800: '#262626',
-		900: '#171717'
-	},
-	gray: {
-		50: '#fafafa',
-		100: '#f4f4f5',
-		200: '#e4e4e7',
-		300: '#d4d4d8',
-		400: '#a1a1aa',
-		500: '#71717a',
-		600: '#52525b',
-		700: '#3f3f46',
-		800: '#27272a',
-		900: '#18181b'
-	},
-	blueGray: {
-		50: '#f8fafc',
-		100: '#f1f5f9',
-		200: '#e2e8f0',
-		300: '#cbd5e1',
-		400: '#94a3b8',
-		500: '#64748b',
-		600: '#475569',
-		700: '#334155',
-		800: '#1e293b',
-		900: '#0f172a'
-	}
-}
-
-export const shapePaths = {
-	// square: ['M', 1, 1, 'L', 9, 1, 'L', 9, 9, 'L', 1, 9, 'Z'],
-	square: [
-		['M', 0.1, 0],
-		['A', 0.1, 0.1, 0, 0, 0, 0, 0.1, 'V', 0.9],
-		['A', 0.1, 0.1, 0, 0, 0, 0.1, 1, 'H', 0.9],
-		['A', 0.1, 0.1, 0, 0, 0, 1, 0.9, 'V', 0.1],
-		['A', 0.1, 0.1, 0, 0, 0, 0.9, 0, 'Z']
-	],
-	circle: [
-		['M', 0, 5],
-		['A', 5, 5, 0, 0, 0, 10, 5],
-		['A', 5, 5, 0, 0, 0, 0, 5]
-	],
-	triangle: ['M', 5, 0, 'L', 10, 10, 'L', 0, 10, 'Z'],
-	diamond: [
-		['M', 5, 0],
-		['A', 7, 7, 0, 0, 0, 10, 5],
-		['A', 7, 7, 0, 0, 0, 5, 10],
-		['A', 7, 7, 0, 0, 0, 0, 5],
-		['A', 7, 7, 0, 0, 0, 5, 0]
-	],
-	rhombus: ['M', 0, 5, 'L', 5, 0, 'L', 10, 5, 'L', 5, 10, 'Z'],
-	heart: [
-		['M', 9, 5],
-		['A', 0.8, 0.8, 0, 0, 0, 5, 2],
-		['A', 0.8, 0.8, 0, 0, 0, 1, 5],
-		['L', 5, 9],
-		['L', 9, 5]
-	],
-	star: [
-		['M', 4.80001, 0],
-		['L', 5.92258, 3.45491],
-		['H', 9.55529],
-		['L', 6.61637, 5.59017],
-		['L', 7.73894, 9.04509],
-		['L', 4.80001, 6.90983],
-		['L', 1.86108, 9.04509],
-		['L', 2.98365, 5.59017],
-		['L', 0.0447266, 3.45491],
-		['H', 3.67744],
-		['L', 4.80001, 0],
-		['Z']
-	]
-}

package/src/lib/pattern.js

@@ -1,6 +1,6 @@
 import { clamp } from 'yootils'
 import { ColorBrewer } from './color'
-import { toHexString, uniqueId } from './utils'
+import { toHexString, uniqueId, addToArray, toArray } from './utils'
 
 export const builtIn = [
 	{ path: 'M0 5A6 6 0 0 0 10 5', minAngle: 0, maxAngle: 90 },
@@ -125,20 +125,18 @@ export class PatternBrewer {
 	}
 
 	add(path) {
-		let paths = Array.isArray(path) ? path : [path]
-		this.paths = [...this.paths, ...paths]
-
+		this.paths = addToArray(this.pathc, path)
 		return this
 	}
 
 	filter(indices) {
-		indices = Array.isArray(indices) ? indices : [indices]
+		indices = toArray(indices)
 		this.indices = indices.filter((i) => i >= 0 && i < this.paths.length)
 		return this
 	}
 
 	colors(shades, repeat = false) {
-		this.shades = Array.isArray(shades) ? shades : [shades]
+		this.shades = toArray(shades)
 		this.repeat = repeat
 		return this
 	}

package/src/lib/shape.js

@@ -1,13 +1,9 @@
 import { ColorBrewer } from './color'
-import { scaledPath } from './utils'
-import { shapePaths } from './constants'
-
+import { symbols } from '@rokkit/atoms/symbols'
+import { addToArray, toArray } from './utils'
 export class ShapeBrewer {
 	constructor() {
-		this.shapes = Object.entries(shapePaths).reduce(
-			(acc, [name, path]) => ({ ...acc, [name]: (s) => scaledPath(s, path) }),
-			{}
-		)
+		this.shapes = Object.keys(symbols)
 		this.repeat = false
 		this.keys = Object.keys(this.shapes)
 		this.gray = new ColorBrewer().gray()
@@ -16,26 +12,24 @@ export class ShapeBrewer {
 	}
 
 	clear() {
-		this.shapes = {}
+		this.shapes = []
 		return this
 	}
 
 	add(shape) {
-		const shapes = typeof shape === 'object' ? shape : { shape }
-		this.shapes = { ...this.shapes, ...shapes }
+		this.shapes = addToArray(this.shapes, shape)
 
 		return this
 	}
 
 	filter(keys) {
-		keys = Array.isArray(keys) ? keys : [keys]
-		this.keys = keys.filter((key) => key in this.shapes)
+		this.keys = toArray(keys).filter((key) => key in this.shapes)
 
 		return this
 	}
 
 	colors(shades, repeat = false) {
-		this.shades = Array.isArray(shades) ? shades : [shades]
+		this.shades = toArray(shades)
 		this.repeat = repeat
 		return this
 	}

package/src/lib/utils.js

@@ -4,9 +4,11 @@ import { ascending, quantile } from 'd3-array'
 import { nest } from 'd3-collection'
 import { omit } from 'ramda'
 
-export function scaledPath(size, x) {
-	if (Array.isArray(x)) return x.map((x) => scaledPath(size, x)).join(' ')
-	return typeof size === 'number' ? x * size : x
+export function toArray(value) {
+	return Array.isArray(value) ? value : [value]
+}
+export function addToArray(array, value) {
+	return [...array, ...toArray(value)]
 }
 /**
  * Calculates a grid of centres to fit a list of items of `size` within the number of `columns` and `rows`.

package/src/plots/FunnelPlot.svelte

@@ -1,6 +1,6 @@
 <script>
 	import { getContext } from 'svelte'
-	import { compact } from '../lib/utils-2'
+	import { compact } from '@rokkit/core'
 	import { funnel } from '../lib/funnel'
 
 	const chart = getContext('chart')

package/src/lib/utils-2.js

@@ -1,125 +0,0 @@
-import { scaleBand, scaleLinear } from 'd3-scale'
-import { min, max } from 'd3-array'
-import { ascending, quantile } from 'd3-array'
-import { nest } from 'd3-collection'
-import { omit } from 'ramda'
-
-/**
- * Calculates a grid of centres to fit a list of items of `size` within the number of `columns` and `rows`.
- *
- * - Attempts to find a best fit square if both columns and rows are not specified
- * - Value in columns is prioritized over rows for recalculating the grid
- * - Supports padding between the items
- *
- * @param {number} count
- * @param {number} size
- * @param {number} pad
- * @param {number} columns
- * @param {number} rows
- * @returns
- */
-export function swatch(count, size, pad = 0, columns, rows) {
-	if (columns > 0) {
-		rows = Math.ceil(count / columns)
-	} else if (rows > 0) {
-		columns = Math.ceil(count / rows)
-	} else {
-		columns = Math.ceil(Math.sqrt(count))
-		rows = Math.ceil(count / columns)
-	}
-
-	const width = (size + pad) * columns + pad
-	const height = (size + pad) * rows + pad
-	const data = [...Array(count).keys()].map((index) => ({
-		cx: (size + pad) / 2 + (index % columns) * (size + pad),
-		cy: (size + pad) / 2 + Math.floor(index / columns) * (size + pad),
-		r: size / 2
-	}))
-
-	return { width, height, data }
-}
-/**
- * Get a scale function mapping the values between a range of lower and upper values
- *
- * @param {array} values
- * @param {array[2]} bounds
- * @param {number} buffer
- * @returns
- */
-export function getScale(values, bounds, buffer = 0) {
-	if (values.some(isNaN)) {
-		return scaleBand().range(bounds).domain(values).padding(0.5)
-	} else {
-		// ensure that all numeric values are converted to numbers so that d3 min/max provide correct results
-		values = values.map((n) => +n)
-
-		let minValue = min(values)
-		let maxValue = max(values)
-
-		if (minValue < 0 && maxValue > 0) {
-			maxValue = max([-1 * minValue, maxValue])
-			minValue = -1 * maxValue
-		}
-		const margin = (maxValue - minValue) * buffer
-		return scaleLinear()
-			.domain([minValue - margin, maxValue + margin])
-			.range(bounds)
-	}
-}
-/**
- * Obtain the scale function for the `x` and `y` fields in the data set.
- *
- * @param {array<dict>} data
- * @param {string} x
- * @param {string} y
- * @param {number} width
- * @param {number} height
- * @returns
- */
-export function getScales(data, x, y, width, height) {
-	const xValues = [...new Set(data.map((item) => item[x]))]
-	const yValues = [...new Set(data.map((item) => item[y]))]
-
-	return {
-		scaleX: getScale(xValues, [0, width]),
-		scaleY: getScale(yValues, [height, 0], 0.1)
-	}
-}
-
-/**
- * Summarize `data` by fields `x` and `y` and return a nested array with
- * key as unique `x` values and value as statistical summaries of `y` values
- *
- * @param {*} data
- * @param {*} x
- * @param {*} y
- * @returns
- */
-export function aggregate(data, x, y) {
-	const summary = nest()
-		.key((d) => d[x])
-		.rollup((d) => {
-			let values = d.map((g) => g[y]).sort(ascending)
-			let q1 = quantile(values, 0.25)
-			let q3 = quantile(values, 0.75)
-			let median = quantile(values, 0.5)
-			let interQuantileRange = q3 - q1
-			let min = q1 - 1.5 * interQuantileRange
-			let max = q3 + 1.5 * interQuantileRange
-			return { q1, q3, median, interQuantileRange, min, max }
-		})
-		.entries(data)
-	return summary
-}
-export function getPaletteForValues(values, { palette, fallback }) {
-	return values.map((value, index) =>
-		index < palette.length ? palette[index] : fallback
-	)
-}
-
-export function toNested(data, key, label) {
-	return nest()
-		.key((d) => d[key])
-		.rollup((values) => values.map((value) => omit([key], value)))
-		.entries(data.sort((a, b) => ascending(a[label], b[label])))
-}