fix more import declarations

svelteplot · gka · Jun 18, 2025 · Jun 18, 2025 · Jun 18, 2025 · Jun 18, 2025
commit cdb82d0fea8b6fba6349c37079e92f72d5dac809
diff --git a/src/lib/helpers/autoTimeFormat.ts b/src/lib/helpers/autoTimeFormat.ts
@@ -1,5 +1,5 @@
-import type { Scale } from '$lib/classes/Scale.svelte.js';
-import { isDate } from '$lib/helpers/typeChecks';
+import type { PlotScale } from '$lib/types/index.js';
+import { isDate } from '$lib/helpers/typeChecks.js';
 
 const DATE_TIME: Intl.DateTimeFormatOptions = {
     hour: 'numeric',
@@ -32,9 +32,9 @@ const autoFormatMonthYear = (locale: string) => {
     return (date: Date) => format(date).replace(' ', '\n');
 };
 
-export default function autoTimeFormat(x: Scale, plotWidth: number, plotLocale: string) {
+export default function autoTimeFormat(x: PlotScale, plotWidth: number, plotLocale: string) {
     const daysPer100Px =
-        ((toNumber(x.domain[1]) - toNumber(x.domain[0])) / plotWidth / 864e5) * 100;
+        ((toNumber(x.domain[1] as Date) - toNumber(x.domain[0] as Date)) / plotWidth / 864e5) * 100;
     const format =
         daysPer100Px < 1
             ? autoFormatDateTime(plotLocale)

diff --git a/src/lib/helpers/group.test.ts b/src/lib/helpers/group.test.ts
@@ -1,4 +1,4 @@
-import { groupFacetsAndZ } from './group';
+import { groupFacetsAndZ } from './group.js';
 import { describe, it, expect } from 'vitest';
 
 describe('groupFacetsAndZ', () => {

diff --git a/src/lib/helpers/index.test.ts b/src/lib/helpers/index.test.ts
@@ -1,4 +1,4 @@
-import { coalesce, isObject, omit } from './index';
+import { coalesce, isObject, omit } from './index.js';
 import { describe, it, expect } from 'vitest';
 
 describe('coalesce', () => {

diff --git a/src/lib/marks/Area.svelte b/src/lib/marks/Area.svelte
@@ -37,9 +37,9 @@
         ChannelAccessor,
         ScaledDataRecord,
         LinkableMarkProps,
-        PlotDefaults
+        PlotDefaults,
+        RawValue
     } from '../types/index.js';
-    import type { RawValue } from 'svelteplot/types/index.js';
     import type { StackOptions } from '$lib/transforms/stack.js';
 
     let markProps: AreaMarkProps = $props();

diff --git a/src/lib/marks/DifferenceY.svelte b/src/lib/marks/DifferenceY.svelte
@@ -53,7 +53,7 @@
         PlotContext,
         PlotDefaults
     } from 'svelteplot/types/index.js';
-    import { Line, Area } from '$lib/marks';
+    import { Line, Area } from '$lib/marks/index.js';
     import { randomId, coalesce } from '$lib/helpers/index.js';
     import { getContext } from 'svelte';
     import { extent, max, min } from 'd3-array';

diff --git a/src/lib/marks/Geo.svelte b/src/lib/marks/Geo.svelte
@@ -36,7 +36,7 @@
     import { geoPath } from 'd3-geo';
     import { resolveChannel, resolveProp, resolveStyles } from '$lib/helpers/resolve.js';
     import callWithProps from '$lib/helpers/callWithProps.js';
-    import { sort } from '$lib/transforms';
+    import { sort } from '$lib/transforms/index.js';
     import { addEventHandlers } from './helpers/events.js';
     import GeoCanvas from './helpers/GeoCanvas.svelte';
     import { recordize } from '$lib/transforms/recordize.js';

diff --git a/src/lib/marks/RectX.svelte b/src/lib/marks/RectX.svelte
@@ -11,7 +11,7 @@
     import { intervalY, stackX, recordizeX } from 'svelteplot';
     import type { DataRecord, PlotContext, PlotDefaults } from '../types/index.js';
     import { getContext, type ComponentProps } from 'svelte';
-    import type { StackOptions } from '$lib/transforms/stack';
+    import type { StackOptions } from '$lib/transforms/stack.js';
 
     let markProps: RectXMarkProps = $props();
 

diff --git a/src/lib/marks/RectY.svelte b/src/lib/marks/RectY.svelte
@@ -9,7 +9,7 @@
     import { intervalX, stackY, recordizeY } from 'svelteplot';
     import type { DataRecord, PlotContext, PlotDefaults } from '../types/index.js';
     import { getContext, type ComponentProps } from 'svelte';
-    import type { StackOptions } from '$lib/transforms/stack';
+    import type { StackOptions } from '$lib/transforms/stack.js';
 
     let markProps: RectYMarkProps = $props();
 

diff --git a/src/lib/marks/helpers/Anchor.svelte b/src/lib/marks/helpers/Anchor.svelte
@@ -1,5 +1,5 @@
 <script>
-    import { resolveProp } from '$lib/helpers/resolve';
+    import { resolveProp } from '$lib/helpers/resolve.js';
 
     let { datum = {}, options = {}, children } = $props();
 

diff --git a/src/lib/marks/helpers/AreaCanvas.svelte b/src/lib/marks/helpers/AreaCanvas.svelte
@@ -12,7 +12,7 @@
     import CanvasLayer from './CanvasLayer.svelte';
     import type { Attachment } from 'svelte/attachments';
     import { devicePixelRatio } from 'svelte/reactivity/window';
-    import { resolveColor } from './canvas';
+    import { resolveColor } from './canvas.js';
 
     let {
         mark,

diff --git a/src/lib/marks/helpers/DotCanvas.svelte b/src/lib/marks/helpers/DotCanvas.svelte
@@ -13,7 +13,7 @@
     import CanvasLayer from './CanvasLayer.svelte';
     import { getContext } from 'svelte';
     import { devicePixelRatio } from 'svelte/reactivity/window';
-    import { resolveColor } from './canvas';
+    import { resolveColor } from './canvas.js';
 
     const { getPlotState } = getContext<PlotContext>('svelteplot');
     const plot = $derived(getPlotState());

diff --git a/src/lib/marks/helpers/LineCanvas.svelte b/src/lib/marks/helpers/LineCanvas.svelte
@@ -12,7 +12,7 @@
     import CanvasLayer from './CanvasLayer.svelte';
     import type { Attachment } from 'svelte/attachments';
     import { devicePixelRatio } from 'svelte/reactivity/window';
-    import { resolveColor } from './canvas';
+    import { resolveColor } from './canvas.js';
 
     let {
         mark,

diff --git a/src/lib/marks/helpers/RectPath.svelte b/src/lib/marks/helpers/RectPath.svelte
@@ -37,7 +37,7 @@ Helper component for rendering rectangular marks in SVG
         PlotContext,
         DataRecord
     } from 'svelteplot';
-    import { addEventHandlers } from './events';
+    import { addEventHandlers } from './events.js';
     import { getContext } from 'svelte';
     import Anchor from './Anchor.svelte';
 

diff --git a/src/lib/marks/helpers/Regression.svelte b/src/lib/marks/helpers/Regression.svelte
@@ -47,7 +47,7 @@
     import { resolveChannel } from '$lib/helpers/resolve.js';
     import { confidenceInterval } from '$lib/helpers/math.js';
     import callWithProps from '$lib/helpers/callWithProps.js';
-    import { isDate } from '$lib/helpers/typeChecks';
+    import { isDate } from '$lib/helpers/typeChecks.js';
 
     const regressions = new Map<RegressionType, typeof regressionLinear>([
         ['linear', regressionLinear],

diff --git a/src/lib/transforms/bollinger.test.ts b/src/lib/transforms/bollinger.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { bollingerX, bollingerY } from './bollinger.js';
-import type { TransformArg } from '../src/lib/types';
+import type { TransformArg } from '../src/lib/types/index.js';
 
 describe('bollinger transform', () => {
     const mockData = [

diff --git a/src/lib/types/plot.ts b/src/lib/types/plot.ts
@@ -11,7 +11,7 @@ import type {
     ScaleOptions,
     XScaleOptions,
     YScaleOptions
-} from '.';
+} from './index.js';
 import type { Snippet } from 'svelte';
 
 import type {
@@ -50,7 +50,7 @@ import type {
     TickX,
     TickY,
     Vector
-} from '../marks';
+} from '../marks/index.js';
 
 export type PlotState = {
     width: number;