svelteplot 0.1.3-next.9 → 0.2.1

package/dist/transforms/recordize.d.ts

@@ -1,4 +1,5 @@
 import type { TransformArgsRow, TransformArgsRecord } from '../types.js';
+export declare const INDEX: unique symbol;
 export declare const RAW_VALUE: unique symbol;
 export declare function recordizeX({ data, ...channels }: TransformArgsRow, { withIndex }?: {
     withIndex: boolean;
@@ -12,3 +13,4 @@ export declare function recordizeY({ data, ...channels }: TransformArgsRow, { wi
  * the rest of our code doesn't have to deal with this case anymore.
  */
 export declare function recordizeXY({ data, ...channels }: TransformArgsRow): TransformArgsRecord;
+export declare function recordize({ data, ...channels }: TransformArgsRow): TransformArgsRecord;

package/dist/transforms/recordize.js

@@ -1,5 +1,6 @@
 import isDataRecord from '../helpers/isDataRecord.js';
-export const RAW_VALUE = Symbol();
+export const INDEX = Symbol('index');
+export const RAW_VALUE = Symbol('originalValue');
 /*
  * This transform takes an array of raw values as input and returns data records
  * in which the values are interpreted as x channel and their index as y
@@ -10,14 +11,12 @@ export function recordizeX({ data, ...channels }, { withIndex } = { withIndex: t
         return {
             data: data.map((value, index) => ({
                 __value: value,
-                ...(withIndex ? { __index: index } : {}),
+                ...(withIndex ? { [INDEX]: index } : {}),
                 [RAW_VALUE]: value,
-                // TODO: remove ___orig___ references
-                ___orig___: value
             })),
             ...channels,
-            x: '__value',
-            ...(withIndex ? { y: '__index' } : {})
+            x: RAW_VALUE,
+            ...(withIndex ? { y: INDEX } : {})
         };
     }
     return { data: data, ...channels };
@@ -33,14 +32,12 @@ export function recordizeY({ data, ...channels }, { withIndex } = { withIndex: t
     if (dataIsRawValueArray) {
         return {
             data: Array.from(data).map((value, index) => ({
-                __value: value,
                 ...(withIndex ? { __index: index } : {}),
                 [RAW_VALUE]: value,
-                ___orig___: value
             })),
             ...channels,
             ...(withIndex ? { x: '__index' } : {}),
-            y: '__value'
+            y: RAW_VALUE
         };
     }
     return {
@@ -66,7 +63,7 @@ export function recordizeXY({ data, ...channels }) {
         channels.y === undefined) {
         return {
             data: data.map(([x, y, ...rest]) => ({
-                ___orig___: [x, y, ...rest],
+                [RAW_VALUE]: [x, y, ...rest],
                 __x: x,
                 __y: y
             })),
@@ -77,3 +74,16 @@ export function recordizeXY({ data, ...channels }) {
     }
     return { data, ...channels };
 }
+export function recordize({ data, ...channels }) {
+    if (!data)
+        return { data, ...channels };
+    if (!isDataRecord(data[0])) {
+        return {
+            data: data.map((d) => ({
+                [RAW_VALUE]: d,
+            })),
+            ...channels,
+        };
+    }
+    return { data, ...channels };
+}

package/dist/transforms/stack.js

@@ -2,6 +2,9 @@ import isDataRecord from '../helpers/isDataRecord.js';
 import { resolveChannel } from '../helpers/resolve.js';
 import { stack, stackOffsetExpand, stackOffsetSilhouette, stackOffsetWiggle, stackOrderAppearance, stackOrderAscending, stackOrderInsideOut, stackOrderNone, stackOffsetDiverging } from 'd3-shape';
 import { index, union, groups as d3Groups } from 'd3-array';
+import { RAW_VALUE } from './recordize';
+const GROUP = Symbol('group');
+const FACET = Symbol('group');
 const DEFAULT_STACK_OPTIONS = {
     order: null,
     offset: null,
@@ -39,8 +42,8 @@ function stackXY(byDim, data, channels, options) {
         const resolvedData = data.map((d) => ({
             ...(isDataRecord(d) ? d : { __orig: d }),
             [`__${secondDim}`]: resolveChannel(secondDim, d, channels),
-            __group: groupBy === true ? 'G' : resolveChannel(groupBy, d, channels),
-            __facet: groupFacetsBy.length > 0
+            [GROUP]: groupBy === true ? 'G' : resolveChannel(groupBy, d, channels),
+            [FACET]: groupFacetsBy.length > 0
                 ? groupFacetsBy
                     .map((channel) => String(resolveChannel(channel, d, channels)))
                     .join('---')
@@ -51,11 +54,11 @@ function stackXY(byDim, data, channels, options) {
         const out = [];
         // first we group the dataset by facets to avoid stacking of rows that are
         // in separate panels
-        const groups = d3Groups(resolvedData, (d) => d.__facet);
+        const groups = d3Groups(resolvedData, (d) => d[FACET]);
         for (const [, facetData] of groups) {
             // now we index the data on the second dimension, e.g. over x
             // when stacking over y
-            const indexed = index(facetData, (d) => d[`__${secondDim}`], (d) => d.__group);
+            const indexed = index(facetData, (d) => d[`__${secondDim}`], (d) => d[GROUP]);
             const stackOrder = (series) => {
                 const f = STACK_ORDER[options.order || 'none'];
                 return options.reverse ? f(series).reverse() : f(series);
@@ -64,7 +67,7 @@ function stackXY(byDim, data, channels, options) {
             const series = stack()
                 .order(stackOrder)
                 .offset(STACK_OFFSET[options.offset])
-                .keys(union(facetData.map((d) => d.__group)))
+                .keys(union(facetData.map((d) => d[GROUP])))
                 .value(([, group], key) => (group.get(key) ? group.get(key)[`__${byDim}`] : 0))(indexed);
             // and combine it all back into a flat array
             const newData = series
@@ -75,8 +78,8 @@ function stackXY(byDim, data, channels, options) {
                     .map((d) => {
                     const datum = d.data[1].get(groupKey);
                     // cleanup our internal keys
-                    delete datum.__group;
-                    delete datum.__facet;
+                    delete datum[GROUP];
+                    delete datum[FACET];
                     return { ...datum, [`__${byLow}`]: d[0], [`__${byHigh}`]: d[1] };
                 });
             })

package/dist/transforms/window.d.ts

@@ -10,12 +10,14 @@ type WindowOptions = {
 export declare function windowX(args: TransformArg<DataRecord>, options: WindowOptions): {
     data: {
         [x: string]: import("../types.js").RawValue;
+        [x: symbol]: import("../types.js").RawValue;
         ___orig___?: import("../types.js").RawValue | [import("../types.js").RawValue, import("../types.js").RawValue];
     }[];
 };
 export declare function windowY(args: TransformArg<DataRecord>, options: WindowOptions): {
     data: {
         [x: string]: import("../types.js").RawValue;
+        [x: symbol]: import("../types.js").RawValue;
         ___orig___?: import("../types.js").RawValue | [import("../types.js").RawValue, import("../types.js").RawValue];
     }[];
 };

package/dist/types.d.ts

@@ -3,6 +3,7 @@ import type { Snippet } from 'svelte';
 import type { MouseEventHandler } from 'svelte/elements';
 import type { MarkerShape } from './marks/helpers/Marker.svelte';
 import type { Writable } from 'svelte/store';
+import type * as CSS from 'csstype';
 export type MarkType = 'area' | 'arrow' | 'axisX' | 'axisY' | 'barX' | 'barY' | 'cell' | 'dot' | 'vector' | 'frame' | 'geo' | 'gridX' | 'gridY' | 'line' | 'rect' | 'regression' | 'ruleX' | 'ruleY' | 'swoopyArrow' | 'text' | 'tickX' | 'tickY';
 export type ScaleName = 'x' | 'y' | 'r' | 'color' | 'opacity' | 'length' | 'symbol' | 'fx' | 'fy' | 'projection';
 export type ScaleType = 'linear' | 'pow' | 'sqrt' | 'log' | 'symlog' | 'time' | 'point' | 'ordinal' | 'sequential' | 'band' | 'categorical' | 'cyclical' | 'threshold' | 'quantile-cont' | 'quantile' | 'quantize' | 'diverging' | 'diverging-log' | 'diverging-pow' | 'diverging-sqrt' | 'diverging-symlog';
@@ -16,7 +17,7 @@ export type Mark<T> = {
 };
 export type ScaledChannelName = 'fill' | 'fillOpacity' | 'opacity' | 'r' | 'length' | 'stroke' | 'strokeOpacity' | 'symbol' | 'fx' | 'fy' | 'x' | 'x1' | 'x2' | 'y' | 'y1' | 'y2';
 export type ChannelName = ScaledChannelName | 'z' | 'sort' | 'filter' | 'interval';
-export type RawValue = number | Date | boolean | string;
+export type RawValue = number | Date | boolean | string | symbol;
 export type ScaleOptions = {
     /**
      * Override the automatic scale type detection.
@@ -159,6 +160,10 @@ export type PlotOptions = {
      * setting the maxWidth style property you can limit the width of your plot.
      */
     maxWidth?: string;
+    /**
+     * force the plot into a fixed width
+     */
+    width?: number;
     /**
      * force the plot into a fixed height
      */
@@ -166,7 +171,12 @@ export type PlotOptions = {
     /**
      * Convenience option for setting all four margins at once, in px.
      */
-    margin: number;
+    margin: number | {
+        top?: number;
+        right?: number;
+        bottom?: number;
+        left?: number;
+    };
     /**
      * Left margin of the plot, in px.
      */
@@ -236,11 +246,11 @@ export type PlotOptions = {
     /**
      * Options for the shared radius scale
      */
-    r: ScaleOptions;
-    color: ColorScaleOptions;
-    opacity: ScaleOptions;
-    symbol: LegendScaleOptions;
-    length: ScaleOptions;
+    r: Partial<ScaleOptions>;
+    color: Partial<ColorScaleOptions>;
+    opacity: Partial<ScaleOptions>;
+    symbol: Partial<LegendScaleOptions>;
+    length: Partial<ScaleOptions>;
     fx: Partial<ScaleOptions>;
     fy: Partial<ScaleOptions>;
     children: Snippet<[
@@ -331,7 +341,7 @@ export type PlotDefaults = {
     markerDotRadius: number;
 };
 export type GenericMarkOptions = Record<string, any>;
-export type DataRecord = Record<string, RawValue> & {
+export type DataRecord = Record<string | symbol, RawValue> & {
     ___orig___?: RawValue | [RawValue, RawValue];
 };
 export type ResolvedDataRecord = Partial<Record<ScaledChannelName, any>> & {
@@ -488,16 +498,16 @@ export type BaseMarkProps = Partial<{
     stroke: ConstantAccessor<string>;
     strokeWidth: ConstantAccessor<number>;
     strokeOpacity: ConstantAccessor<number>;
-    strokeLinejoin: ConstantAccessor<'bevel' | 'miter' | 'miter-clip' | 'round'>;
-    strokeLinecap: ConstantAccessor<'butt' | 'square' | 'round'>;
+    strokeLinejoin: ConstantAccessor<CSS.Property.StrokeLinejoin>;
+    strokeLinecap: ConstantAccessor<CSS.Property.StrokeLinecap>;
     strokeMiterlimit: ConstantAccessor<number>;
     opacity: ConstantAccessor<number>;
     strokeDasharray: ConstantAccessor<string>;
     strokeDashoffset: ConstantAccessor<number>;
-    mixBlendMode: ConstantAccessor<'normal' | 'multiply' | 'screen' | 'overlay' | 'darken' | 'lighten' | 'color-dodge' | 'color-burn' | 'hard-light' | 'soft-light' | 'difference' | 'exclusion' | 'hue' | 'saturation' | 'color' | 'luminosity' | 'plus-darker' | 'plus-lighter'>;
+    mixBlendMode: ConstantAccessor<CSS.Property.MixBlendMode>;
     clipPath: string;
     imageFilter: ConstantAccessor<string>;
-    shapeRendering: ConstantAccessor<'crispEdges' | 'geometricPrecision' | 'optimizeSpeed' | 'auto'>;
+    shapeRendering: ConstantAccessor<CSS.Property.ShapeRendering>;
     paintOrder: ConstantAccessor<string>;
     onclick?: MouseEventHandler<SVGPathElement>;
     ondblclick?: MouseEventHandler<SVGPathElement>;
@@ -507,6 +517,15 @@ export type BaseMarkProps = Partial<{
     onmousemove?: MouseEventHandler<SVGPathElement>;
     onmouseleave?: MouseEventHandler<SVGPathElement>;
     onmouseout?: MouseEventHandler<SVGPathElement>;
+    onmouseover?: MouseEventHandler<SVGPathElement>;
+    onpointercancel?: MouseEventHandler<SVGPathElement>;
+    onpointerdown?: MouseEventHandler<SVGPathElement>;
+    onpointerup?: MouseEventHandler<SVGPathElement>;
+    onpointerenter?: MouseEventHandler<SVGPathElement>;
+    onpointerleave?: MouseEventHandler<SVGPathElement>;
+    onpointermove?: MouseEventHandler<SVGPathElement>;
+    onpointerover?: MouseEventHandler<SVGPathElement>;
+    onpointerout?: MouseEventHandler<SVGPathElement>;
     ondrag?: MouseEventHandler<SVGPathElement>;
     ondrop?: MouseEventHandler<SVGPathElement>;
     ondragstart?: MouseEventHandler<SVGPathElement>;
@@ -534,6 +553,7 @@ export type BaseMarkProps = Partial<{
      * if you want to give your mark element an extra CSS class
      */
     class: string;
+    cursor: ConstantAccessor<CSS.Property.Cursor>;
 }>;
 export type BaseRectMarkProps = {
     rx?: ConstantAccessor<number>;
@@ -544,7 +564,7 @@ export type BaseRectMarkProps = {
     insetRight?: ConstantAccessor<number>;
     insetBottom?: ConstantAccessor<number>;
 };
-export type Channels = Record<string, ChannelAccessor | ConstantAccessor<string | number | boolean>>;
+export type Channels = Record<string, ChannelAccessor | ConstantAccessor<string | number | boolean | symbol>>;
 export type TransformArg<K> = Channels & {
     data: K[];
 };
@@ -632,4 +652,5 @@ export type MapIndexObject = {
 };
 export type MapMethod = 'cumsum' | 'rank' | 'quantile' | ((I: number[], S: number[]) => number[]) | MapIndexObject;
 export type MapOptions = Partial<Record<ScaledChannelName, MapMethod>>;
+export type UsedScales = Record<ScaledChannelName, boolean>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.1.3-next.9",
+    "version": "0.2.1",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",
@@ -47,16 +47,17 @@
     "devDependencies": {
         "@aitodotai/json-stringify-pretty-compact": "^1.3.0",
         "@emotion/css": "^11.13.5",
-        "@sveltejs/adapter-auto": "^6.0.0",
+        "@sveltejs/adapter-auto": "^6.0.1",
         "@sveltejs/adapter-static": "^3.0.8",
         "@sveltejs/eslint-config": "^8.2.0",
-        "@sveltejs/kit": "^2.20.7",
+        "@sveltejs/kit": "^2.21.0",
         "@sveltejs/package": "^2.3.11",
         "@sveltejs/vite-plugin-svelte": "5.0.3",
-        "@sveltepress/theme-default": "^6.0.2",
-        "@sveltepress/twoslash": "^1.2.1",
-        "@sveltepress/vite": "^1.2.1",
+        "@sveltepress/theme-default": "^6.0.3",
+        "@sveltepress/twoslash": "^1.2.2",
+        "@sveltepress/vite": "^1.2.2",
         "@testing-library/svelte": "^5.2.7",
+        "@testing-library/user-event": "^14.6.1",
         "@types/d3-array": "^3.2.1",
         "@types/d3-color": "^3.1.3",
         "@types/d3-dsv": "^3.0.7",
@@ -67,31 +68,33 @@
         "@types/d3-scale": "^4.0.9",
         "@types/d3-scale-chromatic": "^3.1.0",
         "@types/d3-shape": "^3.1.7",
-        "@typescript-eslint/eslint-plugin": "^8.31.1",
-        "@typescript-eslint/parser": "^8.31.1",
+        "@typescript-eslint/eslint-plugin": "^8.32.1",
+        "@typescript-eslint/parser": "^8.32.1",
+        "csstype": "^3.1.3",
         "d3-dsv": "^3.0.1",
         "d3-fetch": "^3.0.1",
         "d3-force": "^3.0.0",
-        "eslint": "^9.25.1",
-        "eslint-config-prettier": "^10.1.2",
-        "eslint-plugin-svelte": "3.5.1",
+        "eslint": "^9.26.0",
+        "eslint-config-prettier": "^10.1.5",
+        "eslint-plugin-svelte": "3.7.0",
         "jsdom": "^26.1.0",
         "prettier": "^3.5.3",
-        "prettier-plugin-svelte": "^3.3.3",
+        "prettier-plugin-svelte": "^3.4.0",
         "remark-code-extra": "^1.0.1",
         "remark-code-frontmatter": "^1.0.0",
         "resize-observer-polyfill": "^1.5.1",
-        "sass": "^1.87.0",
-        "svelte-check": "^4.1.6",
-        "svelte-eslint-parser": "1.1.3",
+        "sass": "^1.89.0",
+        "svelte-check": "^4.2.1",
+        "svelte-eslint-parser": "1.2.0",
         "svelte-highlight": "^7.8.3",
         "topojson-client": "^3.1.0",
         "tslib": "^2.8.1",
-        "typedoc": "^0.28.3",
+        "typedoc": "^0.28.4",
         "typedoc-plugin-markdown": "^4.6.3",
         "typescript": "^5.8.3",
-        "vite": "^6.3.3",
-        "vitest": "^3.1.2"
+        "vite": "^6.3.5",
+        "vitest": "^3.1.3",
+        "vitest-matchmedia-mock": "^2.0.3"
     },
     "types": "./dist/index.d.ts",
     "type": "module",
@@ -109,9 +112,9 @@
         "d3-scale-chromatic": "^3.1.0",
         "d3-shape": "^3.2.0",
         "d3-time": "^3.1.0",
-        "es-toolkit": "^1.36.0",
+        "es-toolkit": "^1.37.2",
         "fast-equals": "^5.2.2",
         "merge-deep": "^3.0.3",
-        "svelte": "5.28.2"
+        "svelte": "5.30.1"
     }
 }