svelteplot 0.5.3-pr-253.2 → 0.5.3-pr-255.1

package/dist/marks/index.d.ts

@@ -27,12 +27,12 @@ export { default as Geo } from './Geo.svelte';
 export { default as Graticule } from './Graticule.svelte';
 export { default as GridX } from './GridX.svelte';
 export { default as GridY } from './GridY.svelte';
+export { default as Image } from './Image.svelte';
 export { default as Line } from './Line.svelte';
 export { default as LineX } from './LineX.svelte';
 export { default as LineY } from './LineY.svelte';
 export { default as Link } from './Link.svelte';
 export { default as Pointer } from './Pointer.svelte';
-export { default as Vector } from './Vector.svelte';
 export { default as Rect } from './Rect.svelte';
 export { default as RectX } from './RectX.svelte';
 export { default as RectY } from './RectY.svelte';
@@ -45,6 +45,9 @@ export { default as Spike } from './Spike.svelte';
 export { default as Text } from './Text.svelte';
 export { default as TickX } from './TickX.svelte';
 export { default as TickY } from './TickY.svelte';
+export { default as Vector } from './Vector.svelte';
+export { default as WaffleX } from './WaffleX.svelte';
+export { default as WaffleY } from './WaffleY.svelte';
 export { default as ColorLegend } from './ColorLegend.svelte';
 export { default as HTMLTooltip } from './HTMLTooltip.svelte';
 export { default as SymbolLegend } from './SymbolLegend.svelte';

package/dist/marks/index.js

@@ -27,12 +27,12 @@ export { default as Geo } from './Geo.svelte';
 export { default as Graticule } from './Graticule.svelte';
 export { default as GridX } from './GridX.svelte';
 export { default as GridY } from './GridY.svelte';
+export { default as Image } from './Image.svelte';
 export { default as Line } from './Line.svelte';
 export { default as LineX } from './LineX.svelte';
 export { default as LineY } from './LineY.svelte';
 export { default as Link } from './Link.svelte';
 export { default as Pointer } from './Pointer.svelte';
-export { default as Vector } from './Vector.svelte';
 export { default as Rect } from './Rect.svelte';
 export { default as RectX } from './RectX.svelte';
 export { default as RectY } from './RectY.svelte';
@@ -45,6 +45,9 @@ export { default as Spike } from './Spike.svelte';
 export { default as Text } from './Text.svelte';
 export { default as TickX } from './TickX.svelte';
 export { default as TickY } from './TickY.svelte';
+export { default as Vector } from './Vector.svelte';
+export { default as WaffleX } from './WaffleX.svelte';
+export { default as WaffleY } from './WaffleY.svelte';
 // HTML marks
 export { default as ColorLegend } from './ColorLegend.svelte';
 export { default as HTMLTooltip } from './HTMLTooltip.svelte';

package/dist/transforms/centroid.d.ts

@@ -1,8 +1,5 @@
 import type { DataRecord, TransformArg } from '../types/index.js';
-declare const CENTROID: unique symbol;
-type WithCentroid<T> = T & {
-    [CENTROID]: [number, number];
-};
+type WithCentroid<T> = T & {};
 export declare function geoCentroid<Datum extends DataRecord>({ data, ...options }: {
     data: Datum[];
 } & TransformArg<Datum>): TransformArg<WithCentroid<Datum>>;

package/dist/transforms/group.js

@@ -1,5 +1,5 @@
 import { groupFacetsAndZ } from '../helpers/group.js';
-import { testFilter } from '../helpers/index.js';
+import { isValid, testFilter } from '../helpers/index.js';
 import { reduceOutputs } from '../helpers/reduce.js';
 import { resolveChannel } from '../helpers/resolve.js';
 import { groups as d3Groups } from 'd3-array';
@@ -58,8 +58,12 @@ export function groupY(input, options = {}) {
 export function groupZ(input, options = {}) {
     return groupXYZ('z', input, options);
 }
+const groupDimRaw = Symbol('groupDimRaw');
 function groupXYZ(dim, { data, ...channels }, options = {}) {
-    if ((dim === 'z' ? channels.z || channels.fill || channels.stroke : channels[dim]) == null)
+    // console.log({ dim, data, channels, options });
+    if ((dim === 'z'
+        ? channels.z || channels.fill || channels.stroke || channels.fx || channels.fy
+        : channels[dim]) == null)
         throw new Error('you must provide a channel to group on ' + dim);
     const propName = options[`${dim}PropName`] != null
         ? options[`${dim}PropName`]
@@ -70,9 +74,11 @@ function groupXYZ(dim, { data, ...channels }, options = {}) {
     // group by x or y
     const groups = dim === 'z'
         ? [[null, data]]
-        : d3Groups(data.filter((d) => testFilter(d, channels)), (d) => {
-            const v = resolveChannel(dim, d, channels);
-            return interval ? interval.round(v) : v;
+        : d3Groups(data
+            .filter((d) => testFilter(d, channels))
+            .map((d) => ({ ...d, [groupDimRaw]: resolveChannel(dim, d, channels) }))
+            .filter((d) => isValid(d[groupDimRaw])), (d) => {
+            return interval ? interval.floor(d[groupDimRaw]) : d[groupDimRaw];
         });
     const newData = [];
     let newChannels = omit({ ...channels }, 'filter');

package/dist/transforms/recordize.d.ts

@@ -1,7 +1,7 @@
 import type { TransformArgsRow, TransformArgsRecord } from '../types/index.js';
-export declare const X: unique symbol;
-export declare const Y: unique symbol;
-export declare const RAW_VALUE: unique symbol;
+export declare const X: any;
+export declare const Y: any;
+export declare const RAW_VALUE: any;
 export declare function indexData<T extends object>(data: T[]): (T & {})[];
 export declare function recordizeX<T>({ data, ...channels }: TransformArgsRow<T>, { withIndex }?: {
     withIndex: boolean;

package/dist/transforms/sort.d.ts

@@ -1,6 +1,6 @@
 import type { DataRow, TransformArg } from '../types/index.js';
-export declare const SORT_KEY: unique symbol;
-export declare const IS_SORTED: unique symbol;
+export declare const SORT_KEY: any;
+export declare const IS_SORTED: any;
 export declare function sort<T>({ data, ...channels }: TransformArg<T>, options?: {
     reverse?: boolean;
 }): any;

package/dist/types/data.d.ts

@@ -11,6 +11,7 @@ export type ScaledDataRecord<T = Record<string | symbol, RawValue>> = Partial<{
     dx: number;
     dy: number;
     datum: DataRecord<T>;
+    resolved: ResolvedDataRecord<T>;
     valid: Boolean;
     index: number;
 };

package/dist/types/mark.d.ts

@@ -6,7 +6,7 @@ export type Mark<T> = {
     data: DataRecord<T>[];
     options: T;
 };
-export type MarkType = 'area' | 'arrow' | 'barX' | 'barY' | 'cell' | 'custom' | 'dot' | 'vector' | 'frame' | 'geo' | 'gridX' | 'gridY' | 'line' | 'rect' | 'regression' | 'ruleX' | 'ruleY' | 'swoopyArrow' | 'text' | 'tickX' | 'tickY';
+export type MarkType = 'area' | 'arrow' | 'barX' | 'barY' | 'cell' | 'custom' | 'dot' | 'vector' | 'frame' | 'geo' | 'gridX' | 'gridY' | 'line' | 'rect' | 'regression' | 'ruleX' | 'ruleY' | 'swoopyArrow' | 'text' | 'tickX' | 'tickY' | 'waffleX' | 'waffleY';
 export type MarkStyleProps = 'strokeDasharray' | 'strokeLinejoin' | 'strokeLinecap' | 'opacity' | 'cursor' | 'pointerEvents' | 'blend' | 'fill' | 'fillOpacity' | 'fontFamily' | 'fontWeight' | 'fontVariant' | 'fontSize' | 'fontStyle' | 'letterSpacing' | 'wordSpacing' | 'stroke' | 'strokeWidth' | 'strokeOpacity' | 'x' | 'y' | 'clipPath' | 'mask' | 'filter' | 'angle' | 'radius' | 'symbol' | 'textAnchor' | 'textTransform' | 'textDecoration' | 'width';
 import type { MouseEventHandler } from 'svelte/elements';
 import type { ChannelAccessor, ConstantAccessor, DataRecord, RawValue } from './index.js';

package/dist/types/plot.d.ts

@@ -3,7 +3,9 @@ import type { ColorScheme } from './colorScheme.js';
 import type { GeoProjection } from 'd3-geo';
 import type { ChannelAccessor, ChannelName, ColorScaleOptions, DataRecord, LegendScaleOptions, PlotScales, ScaleOptions, XScaleOptions, YScaleOptions } from './index.js';
 import type { Snippet } from 'svelte';
-import type { Area, AreaX, AreaY, Arrow, AxisX, AxisY, BarX, BarY, BoxX, BoxY, Brush, BrushX, BrushY, Cell, DifferenceY, Dot, Frame, Geo, Graticule, GridX, GridY, Line, Link, Pointer, Rect, RectX, RectY, RuleX, RuleY, Sphere, Spike, Text, TickX, TickY, Vector } from '../marks/index.js';
+import type { Area, AreaX, AreaY, Arrow, AxisX, AxisY, BarX, BarY, BoxX, BoxY, Brush, BrushX, BrushY, Cell, DifferenceY, Dot, Frame, Geo, Graticule, GridX, GridY, Image, Line, Link, Pointer, Rect, RectX, RectY, RuleX, RuleY, Sphere, Spike, Text, TickX, TickY, Vector } from '../marks/index.js';
+import type WaffleX from '../marks/WaffleX.svelte';
+import type WaffleY from '../marks/WaffleY.svelte';
 export type PlotState = {
     width: number;
     height: number;
@@ -230,6 +232,10 @@ export type PlotDefaults = {
     gridY: Partial<Omit<ComponentProps<typeof GridY>, IgnoreDefaults> & {
         implicit: boolean;
     }>;
+    /**
+     * default props for image marks
+     */
+    image: Partial<Omit<ComponentProps<typeof Image>, IgnoreDefaults>>;
     /**
      * default props for line marks
      */
@@ -294,6 +300,18 @@ export type PlotDefaults = {
      * default props for vector marks
      */
     vector: Partial<Omit<ComponentProps<typeof Vector>, IgnoreDefaults>>;
+    /**
+     * default props for waffle marks, applied to both waffleX and waffleY marks
+     */
+    waffle: Partial<Omit<ComponentProps<typeof WaffleX>, IgnoreDefaults>>;
+    /**
+     * default props for waffleX marks
+     */
+    waffleX: Partial<Omit<ComponentProps<typeof WaffleX>, IgnoreDefaults>>;
+    /**
+     * default props for waffleY marks
+     */
+    waffleY: Partial<Omit<ComponentProps<typeof WaffleY>, IgnoreDefaults>>;
 };
 export type PlotOptions = {
     /**
@@ -418,8 +436,8 @@ export type PlotOptions = {
     opacity: Partial<ScaleOptions>;
     symbol: Partial<LegendScaleOptions>;
     length: Partial<ScaleOptions>;
-    fx: Partial<ScaleOptions>;
-    fy: Partial<ScaleOptions>;
+    fx: Partial<XScaleOptions>;
+    fy: Partial<YScaleOptions>;
     children: Snippet<[
         {
             width: number;

package/dist/types/scale.d.ts

@@ -106,6 +106,14 @@ export type XScaleOptions = ScaleOptions & {
     tickRotate: number;
     labelAnchor: 'auto' | 'left' | 'center' | 'right';
     tickFormat: false | Intl.NumberFormatOptions | ((d: RawValue) => string);
+    /**
+     * Enable word wrapping for axis tick labels, default true
+     */
+    wordWrap: boolean;
+    /**
+     * Remove duplicate ticks from axis, default true
+     */
+    removeDuplicateTicks: boolean;
 };
 export type YScaleOptions = ScaleOptions & {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.5.3-pr-253.2",
+    "version": "0.5.3-pr-255.1",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",
@@ -57,13 +57,13 @@
         "@sveltejs/adapter-auto": "^6.1.1",
         "@sveltejs/adapter-static": "^3.0.10",
         "@sveltejs/eslint-config": "^8.3.4",
-        "@sveltejs/kit": "^2.47.3",
+        "@sveltejs/kit": "^2.48.5",
         "@sveltejs/package": "^2.5.4",
         "@sveltejs/vite-plugin-svelte": "5.1.1",
         "@sveltepress/theme-default": "^6.0.4",
         "@sveltepress/twoslash": "^1.2.2",
         "@sveltepress/vite": "^1.2.2",
-        "@testing-library/svelte": "^5.2.8",
+        "@testing-library/svelte": "^5.2.9",
         "@testing-library/user-event": "^14.6.1",
         "@types/d3-array": "^3.2.2",
         "@types/d3-color": "^3.1.3",
@@ -79,24 +79,24 @@
         "@types/geojson": "^7946.0.16",
         "@types/topojson": "^3.2.6",
         "@types/topojson-client": "^3.1.5",
-        "@typescript-eslint/eslint-plugin": "^8.46.2",
-        "@typescript-eslint/parser": "^8.46.2",
-        "csstype": "^3.1.3",
+        "@typescript-eslint/eslint-plugin": "^8.46.4",
+        "@typescript-eslint/parser": "^8.46.4",
+        "csstype": "^3.2.0",
         "d3-dsv": "^3.0.1",
         "d3-fetch": "^3.0.1",
         "d3-force": "^3.0.0",
-        "eslint": "^9.38.0",
+        "eslint": "^9.39.1",
         "eslint-config-prettier": "^10.1.8",
-        "eslint-plugin-svelte": "3.12.5",
+        "eslint-plugin-svelte": "3.13.0",
         "jsdom": "^26.1.0",
         "prettier": "^3.6.2",
         "prettier-plugin-svelte": "^3.4.0",
-        "puppeteer": "^24.26.1",
+        "puppeteer": "^24.30.0",
         "remark-code-extra": "^1.0.1",
         "remark-code-frontmatter": "^1.0.0",
         "resize-observer-polyfill": "^1.5.1",
-        "sass": "^1.93.2",
-        "svelte-check": "^4.3.3",
+        "sass": "^1.94.0",
+        "svelte-check": "^4.3.4",
         "svelte-eslint-parser": "1.4.0",
         "svelte-highlight": "^7.9.0",
         "svg-path-parser": "^1.1.0",
@@ -107,7 +107,7 @@
         "typedoc-plugin-markdown": "^4.9.0",
         "typescript": "^5.9.3",
         "vite": "^6.4.1",
-        "vitest": "^3.2.4",
+        "vitest": "^4.0.9",
         "vitest-matchmedia-mock": "^2.0.3",
         "yoctocolors": "^2.1.2"
     },
@@ -127,9 +127,9 @@
         "d3-shape": "^3.2.0",
         "d3-time": "^3.1.0",
         "es-toolkit": "^1.41.0",
-        "fast-equals": "^5.3.2",
+        "fast-equals": "^5.3.3",
         "interval-tree-1d": "^1.0.4",
         "merge-deep": "^3.0.3",
-        "svelte": "5.43.0"
+        "svelte": "5"
     }
 }