layerchart 2.0.0-next.3 → 2.0.0-next.31

package/dist/utils/ticks.js

@@ -1,183 +1,169 @@
-import { timeYear, timeMonth, timeWeek, timeDay, timeHour, timeMinute, timeSecond, timeMillisecond, } from 'd3-time';
-import { format } from 'date-fns';
-import { formatDate, PeriodType, getDuration, fail } from '@layerstack/utils';
-import { isScaleBand } from './scales.svelte.js';
-// TODO: Use PeriodType along with Duration to format (and possibly select intervals)
-const majorTicks = [
-    {
-        predicate: (duration) => duration == null, // Unknown
-        interval: timeYear.every(1), // Better than rendering a lot of items
-        format: (date) => date.toString(),
-    },
-    {
-        predicate: (duration) => duration.years > 1,
-        interval: timeYear.every(1),
-        format: (date) => formatDate(date, PeriodType.CalendarYear, { variant: 'short' }),
-    },
-    {
-        predicate: (duration) => duration.years,
-        interval: timeMonth.every(1),
-        format: (date) => formatDate(date, PeriodType.Month, { variant: 'short' }),
-    },
-    {
-        predicate: (duration) => duration.days > 30,
-        interval: timeMonth.every(1),
-        format: (date) => formatDate(date, PeriodType.Month, { variant: 'short' }),
-    },
-    {
-        predicate: (duration) => duration.days,
-        interval: timeDay.every(1),
-        format: (date) => formatDate(date, PeriodType.Day, { variant: 'short' }),
-    },
-    {
-        predicate: (duration) => duration.hours,
-        interval: timeHour.every(1),
-        format: (date) => format(date, 'h:mm a'),
-    },
-    {
-        predicate: (duration) => duration.minutes > 10,
-        interval: timeMinute.every(10),
-        format: (date) => format(date, 'h:mm a'),
-    },
-    {
-        predicate: (duration) => duration.minutes,
-        interval: timeMinute.every(1),
-        format: (date) => format(date, 'h:mm a'),
-    },
-    {
-        predicate: (duration) => duration.seconds > 10,
-        interval: timeSecond.every(10),
-        format: (date) => format(date, 'h:mm:ss'),
-    },
-    {
-        predicate: (duration) => duration.seconds,
-        interval: timeSecond.every(1),
-        format: (date) => format(date, 'h:mm:ss'),
-    },
-    {
-        predicate: (duration) => true, // 0 or more milliseconds
-        interval: timeMillisecond.every(100),
-        format: (date) => format(date, 'h:mm:ss.SSS'),
-    },
-];
-const minorTicks = [
-    {
-        predicate: (duration) => duration == null, // Unknown
-        interval: timeYear.every(1), // Better than rendering a lot of items
-        format: (date) => date.toString(),
-    },
-    {
-        predicate: (duration) => duration.years,
-        interval: timeMonth.every(1),
-        format: (date) => formatDate(date, PeriodType.Month, { variant: 'short' }),
-    },
-    {
-        predicate: (duration) => duration.days > 90,
-        interval: timeMonth.every(1),
-        format: (date) => formatDate(date, PeriodType.Month, { variant: 'short' }),
-    },
-    {
-        predicate: (duration) => duration.days > 30,
-        interval: timeWeek.every(1),
-        format: (date) => formatDate(date, PeriodType.WeekSun, { variant: 'short' }),
-    },
-    {
-        predicate: (duration) => duration.days > 7,
-        interval: timeDay.every(1),
-        format: (date) => formatDate(date, PeriodType.Day, { variant: 'short' }),
-    },
-    {
-        predicate: (duration) => duration.days > 3,
-        interval: timeHour.every(8),
-        format: (date) => format(date, 'h:mm a'),
-    },
-    {
-        predicate: (duration) => duration.days,
-        interval: timeHour.every(1),
-        format: (date) => format(date, 'h:mm a'),
-    },
-    {
-        predicate: (duration) => duration.hours,
-        interval: timeMinute.every(15),
-        format: (date) => format(date, 'h:mm a'),
-    },
-    {
-        predicate: (duration) => duration.minutes > 10,
-        interval: timeMinute.every(10),
-        format: (date) => format(date, 'h:mm a'),
-    },
-    {
-        predicate: (duration) => duration.minutes > 2,
-        interval: timeMinute.every(1),
-        format: (date) => format(date, 'h:mm a'),
-    },
-    {
-        predicate: (duration) => duration.minutes,
-        interval: timeSecond.every(10),
-        format: (date) => format(date, 'h:mm:ss'),
-    },
-    {
-        predicate: (duration) => duration.seconds,
-        interval: timeSecond.every(1),
-        format: (date) => format(date, 'h:mm:ss'),
-    },
-    {
-        predicate: (duration) => true, // 0 or more milliseconds
-        interval: timeMillisecond.every(10),
-        format: (date) => format(date, 'h:mm:ss.SSS'),
-    },
-];
-export function getMajorTicks(start, end) {
-    const duration = getDuration(start, end);
-    for (var t of majorTicks) {
-        if (t.predicate(duration)) {
-            return t.interval;
+import { timeYear, timeMonth, timeDay, timeTicks } from 'd3-time';
+import { format, Duration, isLiteralObject, DateToken, } from '@layerstack/utils';
+import { isScaleBand, isScaleTime } from './scales.svelte.js';
+export function getDurationFormat(duration, options = {
+    multiline: false,
+}) {
+    const { multiline = false, placement = 'bottom' } = options;
+    return function (date, i) {
+        let result = '';
+        if (+duration >= +new Duration({ duration: { years: 1 } })) {
+            // Year
+            result = format(date, 'year');
         }
-    }
-    fail(`Unable to locate major ticks for duration: ${duration}`);
-}
-export function formatMajorTick(date, rangeStart, rangeEnd) {
-    const duration = getDuration(rangeStart, rangeEnd);
-    for (var t of majorTicks) {
-        if (t.predicate(duration)) {
-            return t.format(date);
+        else if (+duration >= +new Duration({ duration: { days: 28 } })) {
+            // Month
+            const isFirst = i === 0 || +timeYear.floor(date) === +date;
+            if (multiline) {
+                result = [format(date, 'month', { variant: 'short' }), isFirst && format(date, 'year')];
+            }
+            else {
+                result =
+                    format(date, 'month', { variant: 'short' }) +
+                        (isFirst ? ` '${format(date, 'year', { variant: 'short' })}` : '');
+            }
         }
-    }
-    fail(`Unable to format major ticks for duration: ${duration}`);
-}
-export function getMinorTicks(start, end) {
-    const duration = getDuration(start, end);
-    for (var t of minorTicks) {
-        if (t.predicate(duration)) {
-            return t.interval;
+        else if (+duration >= +new Duration({ duration: { days: 1 } })) {
+            // Day
+            const isFirst = i === 0 || date.getDate() <= duration.days;
+            if (multiline) {
+                result = [
+                    format(date, 'custom', { custom: DateToken.DayOfMonth_numeric }),
+                    isFirst && format(date, 'month', { variant: 'short' }),
+                ];
+            }
+            else {
+                result = format(date, 'day', { variant: 'short' });
+            }
         }
-    }
-    fail(`Unable to locate minor ticks for duration: ${duration}`);
+        else if (+duration >= +new Duration({ duration: { hours: 1 } })) {
+            // Hours
+            const isFirst = i === 0 || +timeDay.floor(date) === +date;
+            if (multiline) {
+                result = [
+                    format(date, 'custom', { custom: DateToken.Hour_numeric }),
+                    isFirst && format(date, 'day', { variant: 'short' }),
+                ];
+            }
+            else {
+                result = isFirst
+                    ? format(date, 'day', { variant: 'short' })
+                    : format(date, 'custom', { custom: DateToken.Hour_numeric });
+            }
+        }
+        else if (+duration >= +new Duration({ duration: { minutes: 1 } })) {
+            // Minutes
+            const isFirst = i === 0 || +timeDay.floor(date) === +date;
+            if (multiline) {
+                result = [
+                    format(date, 'time', { variant: 'short' }),
+                    isFirst && format(date, 'day', { variant: 'short' }),
+                ];
+            }
+            else {
+                result = format(date, 'time', { variant: 'short' });
+            }
+        }
+        else if (+duration >= +new Duration({ duration: { seconds: 1 } })) {
+            // Seconds
+            const isFirst = i === 0 || +timeDay.floor(date) === +date;
+            result = [
+                format(date, 'time'),
+                multiline && isFirst && format(date, 'day', { variant: 'short' }),
+            ];
+        }
+        else if (+duration >= +new Duration({ duration: { milliseconds: 1 } })) {
+            // Milliseconds
+            const isFirst = i === 0 || +timeDay.floor(date) === +date;
+            result = [
+                format(date, 'custom', {
+                    custom: [
+                        DateToken.Hour_2Digit,
+                        DateToken.Minute_2Digit,
+                        DateToken.Second_2Digit,
+                        DateToken.MiliSecond_3,
+                        DateToken.Hour_woAMPM,
+                    ],
+                }),
+                multiline && isFirst && format(date, 'day', { variant: 'short' }),
+            ];
+        }
+        else {
+            result = date.toString();
+        }
+        if (Array.isArray(result)) {
+            switch (placement) {
+                case 'top':
+                    return result.filter(Boolean).reverse().join('\n');
+                case 'bottom':
+                    return result.filter(Boolean).join('\n');
+                case 'left':
+                    return result.filter(Boolean).reverse().join(' ');
+                case 'right':
+                    return result.filter(Boolean).join(' ');
+                default:
+                    return result.filter(Boolean).join('\n');
+            }
+        }
+        else {
+            return result;
+        }
+    };
 }
-export function resolveTickVals(scale, ticks, placement) {
+export function resolveTickVals(scale, ticks, count, interval) {
+    // Explicit ticks
     if (Array.isArray(ticks))
         return ticks;
+    // Function
     if (typeof ticks === 'function')
         return ticks(scale) ?? [];
+    // Interval
     if (isLiteralObject(ticks) && 'interval' in ticks) {
         if (ticks.interval === null || !('ticks' in scale) || typeof scale.ticks !== 'function') {
             return []; // Explicitly return empty array for null interval or invalid scale
         }
         return scale.ticks(ticks.interval);
     }
+    // Band (use domain)
     if (isScaleBand(scale)) {
         return ticks && typeof ticks === 'number'
             ? scale.domain().filter((_, i) => i % ticks === 0)
             : scale.domain();
     }
+    // Ticks from scale
     if (scale.ticks && typeof scale.ticks === 'function') {
-        if (placement) {
-            return scale.ticks(ticks ?? (placement === 'left' || placement === 'right' ? 4 : undefined));
+        const tickVals = scale.ticks(count ?? (typeof ticks === 'number' ? ticks : undefined));
+        if (interval) {
+            // Remove last tick when interval is provided (such as for bar charts with center aligned (offset) ticks)
+            tickVals.pop();
         }
-        return scale.ticks(ticks);
+        return tickVals;
     }
     return [];
 }
-function isLiteralObject(val) {
-    return val !== null && typeof val === 'object' && !Array.isArray(val);
+export function resolveTickFormat(options) {
+    const { scale, ticks, count, formatType, multiline, placement } = options;
+    // Explicit format
+    if (formatType) {
+        // @ts-expect-error - improve types
+        return (tick) => format(tick, formatType);
+    }
+    // Time scale
+    if (isScaleTime(scale) && count) {
+        if (isLiteralObject(ticks) && 'interval' in ticks && ticks.interval != null) {
+            const start = ticks.interval.floor(new Date());
+            const end = ticks.interval.ceil(new Date());
+            return getDurationFormat(new Duration({ start, end }), { multiline, placement });
+        }
+        else {
+            // Compare first 2 ticks to determine duration between ticks for formatting
+            const [start, end] = timeTicks(scale.domain()[0], scale.domain()[1], count);
+            return getDurationFormat(new Duration({ start, end }), { multiline, placement });
+        }
+    }
+    // Format from scale
+    if (scale.tickFormat) {
+        return scale.tickFormat(count);
+    }
+    return (tick) => `${tick}`;
 }

package/dist/utils/ticks.test.js

@@ -35,33 +35,28 @@ describe('resolveTickVals', () => {
         const scale = { domain: mockDomain, bandwidth: vi.fn() };
         expect(resolveTickVals(scale)).toEqual(['a', 'b', 'c', 'd', 'e']);
     });
-    it('uses default 4 ticks for left placement', () => {
-        const scale = { ticks: vi.fn(() => [1, 2, 3, 4]) };
-        expect(resolveTickVals(scale, undefined, 'left')).toEqual([1, 2, 3, 4]);
-        expect(scale.ticks).toHaveBeenCalledWith(4);
-    });
-    it('uses default 4 ticks for right placement', () => {
-        const scale = { ticks: vi.fn(() => [1, 2, 3, 4]) };
-        expect(resolveTickVals(scale, undefined, 'right')).toEqual([1, 2, 3, 4]);
-        expect(scale.ticks).toHaveBeenCalledWith(4);
-    });
     it('uses undefined for non-left/right placement', () => {
-        const scale = { ticks: vi.fn(() => [1, 2]) };
-        expect(resolveTickVals(scale, undefined, 'top')).toEqual([1, 2]);
+        const scale = { domain: mockDomain, ticks: vi.fn(() => [1, 2]) };
+        expect(resolveTickVals(scale, undefined, undefined)).toEqual([1, 2]);
         expect(scale.ticks).toHaveBeenCalledWith(undefined);
     });
     it('passes number ticks to scale.ticks', () => {
-        const scale = { ticks: vi.fn(() => [10, 20]) };
+        const scale = { domain: mockDomain, ticks: vi.fn(() => [10, 20]) };
         expect(resolveTickVals(scale, 5)).toEqual([10, 20]);
         expect(scale.ticks).toHaveBeenCalledWith(5);
     });
     it('returns empty array for scale without ticks', () => {
-        const scale = {};
+        const scale = { domain: mockDomain };
         expect(resolveTickVals(scale, 5)).toEqual([]);
     });
     it('handles null ticks with placement', () => {
-        const scale = { ticks: vi.fn(() => [1, 2, 3]) };
-        expect(resolveTickVals(scale, null, 'bottom')).toEqual([1, 2, 3]);
+        const scale = { domain: mockDomain, ticks: vi.fn(() => [1, 2, 3]) };
+        expect(resolveTickVals(scale, null, undefined)).toEqual([1, 2, 3]);
         expect(scale.ticks).toHaveBeenCalledWith(undefined);
     });
+    it('removes last tick when interval is provided', () => {
+        const interval = { every: vi.fn() };
+        const scale = { ticks: vi.fn(() => [1, 2, 3, 4]) };
+        expect(resolveTickVals(scale, undefined, undefined, interval)).toEqual([1, 2, 3]);
+    });
 });

package/dist/utils/treemap.d.ts

@@ -9,5 +9,5 @@ export declare function aspectTile(tile: TileFunc, width: number, height: number
 /**
  * Show if the node (a) is a child of the selected (b), or any parent above selected
  */
-export declare function isNodeVisible(a: HierarchyNode<any>, b: HierarchyNode<any> | null): boolean;
+export declare function isNodeVisible(a: HierarchyNode<any>, b: HierarchyNode<any> | null | undefined): boolean;
 export {};

package/package.json

@@ -4,18 +4,18 @@
   "author": "Sean Lynch <techniq35@gmail.com>",
   "license": "MIT",
   "repository": "techniq/layerchart",
-  "version": "2.0.0-next.3",
+  "version": "2.0.0-next.31",
   "devDependencies": {
-    "@changesets/cli": "^2.29.2",
-    "@mdi/js": "^7.4.47",
+    "@changesets/cli": "^2.29.4",
+    "@iconify-json/lucide": "^1.2.48",
     "@rollup/plugin-dsv": "^3.0.5",
-    "@sveltejs/adapter-cloudflare": "^4.9.0",
-    "@sveltejs/kit": "^2.20.8",
+    "@sveltejs/adapter-cloudflare": "^7.0.4",
+    "@sveltejs/kit": "^2.21.5",
     "@sveltejs/package": "^2.3.11",
-    "@sveltejs/vite-plugin-svelte": "^5.0.3",
+    "@sveltejs/vite-plugin-svelte": "^5.1.0",
     "@svitejs/changesets-changelog-github-compact": "^1.2.0",
     "@tailwindcss/typography": "^0.5.16",
-    "@tailwindcss/vite": "^4.1.5",
+    "@tailwindcss/vite": "^4.1.10",
     "@types/d3": "^7.4.3",
     "@types/d3-array": "^3.2.1",
     "@types/d3-color": "^3.1.3",
@@ -40,40 +40,42 @@
     "@types/topojson-client": "^3.1.5",
     "@types/topojson-simplify": "^3.0.3",
     "@types/topojson-specification": "^1.0.5",
-    "marked": "^15.0.11",
-    "mdsvex": "0.12.3",
-    "posthog-js": "^1.239.0",
+    "marked": "^15.0.12",
+    "mdsvex": "^0.12.3",
+    "posthog-js": "^1.252.0",
     "prettier": "^3.5.3",
-    "prettier-plugin-svelte": "^3.3.3",
+    "prettier-plugin-svelte": "^3.4.0",
     "prism-svelte": "^0.5.0",
     "prism-themes": "^1.9.0",
     "prismjs": "^1.30.0",
     "rehype-slug": "^6.0.0",
+    "rollup-plugin-visualizer": "^6.0.3",
     "shapefile": "^0.6.6",
     "solar-calculator": "^0.3.0",
-    "svelte": "5.28.2",
-    "svelte-check": "^4.1.6",
+    "svelte": "5.34.1",
+    "svelte-check": "^4.2.1",
     "svelte-json-tree": "^2.2.0",
-    "svelte-ux": "2.0.0-next.2",
-    "svelte2tsx": "^0.7.36",
-    "tailwindcss": "^4.1.5",
+    "svelte-ux": "2.0.0-next.14",
+    "svelte2tsx": "^0.7.39",
+    "tailwindcss": "^4.1.10",
     "topojson-client": "^3.1.0",
     "topojson-simplify": "^3.0.3",
     "tslib": "^2.8.1",
     "typescript": "^5.8.3",
     "unist-util-visit": "^5.0.0",
+    "unplugin-icons": "^22.1.0",
     "us-atlas": "^3.0.1",
-    "vite": "^6.3.4",
-    "vitest": "^3.1.2"
+    "vite": "^6.3.5",
+    "vite-plugin-devtools-json": "^0.2.0",
+    "vitest": "^3.2.3"
   },
   "type": "module",
   "dependencies": {
     "@dagrejs/dagre": "^1.1.4",
-    "@layerstack/svelte-actions": "1.0.1-next.0",
-    "@layerstack/svelte-state": "0.1.0-next.1",
-    "@layerstack/svelte-stores": "1.0.2-next.0",
-    "@layerstack/tailwind": "2.0.0-next.2",
-    "@layerstack/utils": "1.1.0-next.0",
+    "@layerstack/svelte-actions": "1.0.1-next.12",
+    "@layerstack/svelte-state": "0.1.0-next.17",
+    "@layerstack/tailwind": "2.0.0-next.15",
+    "@layerstack/utils": "2.0.0-next.12",
     "d3-array": "^3.2.4",
     "d3-color": "^3.1.0",
     "d3-delaunay": "^6.0.4",
@@ -93,9 +95,9 @@
     "d3-shape": "^3.2.0",
     "d3-tile": "^1.0.0",
     "d3-time": "^3.1.0",
-    "date-fns": "^4.1.0",
     "lodash-es": "^4.17.21",
-    "runed": "^0.26.0"
+    "memoize": "^10.1.0",
+    "runed": "^0.28.0"
   },
   "peerDependencies": {
     "svelte": "^5.0.0"

package/dist/utils/object.js

@@ -1,2 +0,0 @@
-import { memoize } from 'lodash-es';
-export const memoizeObject = memoize((obj) => obj, (obj) => JSON.stringify(obj));