waveform-analysis 0.1.51 → 0.1.52

package/dist/index.js

@@ -2062,8 +2062,8 @@ function wr(e, t, n) {
 function Tr(e, t, n) {
 	let r = xr(e), i = r[1] - r[0];
 	if (!Number.isFinite(i) || i <= 0) return 0;
-	let a = Number.isFinite(n.minZoomSpan) && (n.minZoomSpan ?? 0) > 0 ? Math.min(i, n.minZoomSpan) : 0, o = Sr(n.minVisiblePoints), s = wr(t, r, o);
-	return a > 0 || o > 0 ? Math.max(a, s) : i / Rt.DEFAULT_MAX_SCALE;
+	let a = Number.isFinite(n.minZoomSpan) && (n.minZoomSpan ?? 0) > 0 ? Math.min(i, n.minZoomSpan) : 0, o = Sr(n.minVisiblePoints), s = wr(t, r, o), c = Number(n.maxZoomScale), l = Number.isFinite(c) && c >= Rt.MIN_SCALE ? i / c : n.maxZoomScale !== null && a === 0 && o === 0 ? i / Rt.DEFAULT_MAX_SCALE : 0;
+	return Math.max(a, s, l);
 }
 function Er(e, t, n, r) {
 	if (r <= 0) return e;
@@ -2429,7 +2429,7 @@ function Mr(e) {
 		let r = Math.abs(e[1] - e[0]);
 		if (!Number.isFinite(r) || r <= 0) return Rt.MIN_SCALE;
 		let i = Tr(e, n, t);
-		return Math.max(Rt.MIN_SCALE, i > 0 ? r / i : Rt.DEFAULT_MAX_SCALE);
+		return Math.max(Rt.MIN_SCALE, i > 0 ? r / i : Infinity);
 	}, R = (e, n, r, i) => Or(Dr(e.rescaleX(U(n, [0, r])).domain(), n, i, t), n, r), z = (e) => {
 		let n = Number(t.minVisiblePoints);
 		return On(e.seriesList, e.xScale.domain(), Number.isFinite(n) && n > 0 ? Math.ceil(n) + 1 : n);
@@ -2535,6 +2535,7 @@ function Pr(e) {
 		z,
 		() => t.minZoomSpan,
 		() => t.minVisiblePoints,
+		() => t.maxZoomScale,
 		() => t.initialXDomain,
 		() => t.initialXDomains,
 		() => t.xDomainStrategy,
@@ -5533,6 +5534,7 @@ var po = ["clip-path"], mo = ["data-series-id", "data-series-name"], ho = [
 		},
 		minZoomSpan: {},
 		minVisiblePoints: { default: 0 },
+		maxZoomScale: {},
 		initialXDomain: {},
 		initialXDomains: {},
 		xDomainStrategy: { default: () => ({ type: "data" }) },

package/dist/types/components/core/useWaveformChartController.d.ts

@@ -334,6 +334,7 @@ export declare function useWaveformChartController(props: ResolvedWaveformChartP
     pannable: boolean;
     minZoomSpan?: number | undefined;
     minVisiblePoints: number;
+    maxZoomScale?: number | null | undefined;
     initialXDomains?: Record<string, [number, number]> | undefined;
     xDomainStrategy: import("../..").WaveformXDomainStrategy;
     yDomain?: [number, number] | undefined;

package/dist/types/components/core/waveformChartTypes.d.ts

@@ -14,6 +14,7 @@ export interface WaveformChartProps {
     pannable?: boolean;
     minZoomSpan?: number;
     minVisiblePoints?: number;
+    maxZoomScale?: number | null;
     initialXDomain?: [number, number];
     initialXDomains?: Record<string, [number, number]>;
     xDomainStrategy?: WaveformXDomainStrategy;

package/dist/types/components/interaction/zoomConstraints.d.ts

@@ -9,6 +9,7 @@ export type ZoomSeriesGroup = readonly PointSeriesSource[];
 interface ZoomConstraintOptions {
     minZoomSpan?: number;
     minVisiblePoints?: number;
+    maxZoomScale?: number | null;
 }
 export declare function resolveMinimumZoomSpan(boundary: [number, number], groups: readonly ZoomSeriesGroup[], options: ZoomConstraintOptions): number;
 export declare function constrainZoomDomain(domain: [number, number], boundary: [number, number], groups: readonly ZoomSeriesGroup[], options: ZoomConstraintOptions): [number, number];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waveform-analysis",
-  "version": "0.1.51",
+  "version": "0.1.52",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/types/index.d.ts",

package/src/components/core/useWaveformChartLifecycle.ts

@@ -213,6 +213,7 @@ export function useWaveformChartLifecycle(context: LifecycleContext) {
       isPresentationMode,
       () => props.minZoomSpan,
       () => props.minVisiblePoints,
+      () => props.maxZoomScale,
       () => props.initialXDomain,
       () => props.initialXDomains,
       () => props.xDomainStrategy,

package/src/components/core/waveformChartTypes.ts

@@ -35,6 +35,7 @@ export interface WaveformChartProps {
   pannable?: boolean
   minZoomSpan?: number
   minVisiblePoints?: number
+  maxZoomScale?: number | null
   initialXDomain?: [number, number]
   initialXDomains?: Record<string, [number, number]>
   xDomainStrategy?: WaveformXDomainStrategy

package/src/components/interaction/useWaveformZoom.ts

@@ -231,7 +231,7 @@ export function useWaveformZoom(context: ZoomContext) {
     const minimumSpan = resolveMinimumZoomSpan(domain, groups, props)
     return Math.max(
       ZOOM_CONSTRAINTS.MIN_SCALE,
-      minimumSpan > 0 ? domainSpan / minimumSpan : ZOOM_CONSTRAINTS.DEFAULT_MAX_SCALE,
+      minimumSpan > 0 ? domainSpan / minimumSpan : Number.POSITIVE_INFINITY,
     )
   }
   const constrainTransform = (

package/src/components/interaction/zoomConstraints.ts

@@ -14,6 +14,7 @@ export type ZoomSeriesGroup = readonly PointSeriesSource[]
 interface ZoomConstraintOptions {
   minZoomSpan?: number
   minVisiblePoints?: number
+  maxZoomScale?: number | null
 }
 
 const xValueCache = new WeakMap<object, Map<string, number[]>>()
@@ -80,10 +81,14 @@ export function resolveMinimumZoomSpan(
       : 0
   const required = resolveRequiredPointCount(options.minVisiblePoints)
   const pointSpan = minimumPointSpan(groups, normalized, required)
-  if (configuredSpan > 0 || required > 0) {
-    return Math.max(configuredSpan, pointSpan)
-  }
-  return boundarySpan / ZOOM_CONSTRAINTS.DEFAULT_MAX_SCALE
+  const configuredScale = Number(options.maxZoomScale)
+  const scaleSpan =
+    Number.isFinite(configuredScale) && configuredScale >= ZOOM_CONSTRAINTS.MIN_SCALE
+      ? boundarySpan / configuredScale
+      : options.maxZoomScale !== null && configuredSpan === 0 && required === 0
+        ? boundarySpan / ZOOM_CONSTRAINTS.DEFAULT_MAX_SCALE
+        : 0
+  return Math.max(configuredSpan, pointSpan, scaleSpan)
 }
 
 function expandToMinimumPoints(

package/src/components/waveformChartCases/zoomPointConstraints.test.ts

@@ -65,10 +65,10 @@ function dispatchBox(
 }
 
 describe('WaveformChart point-aware zoom constraints', () => {
-  it('wheel-zooms 1,200 samples to two distinct X values, stops, and still zooms out', async () => {
+  it('zooms to two distinct X values when the scale limit is disabled', async () => {
     const wrapper = await mountSizedChart(
       { kind: 'points', points: regularPoints },
-      { minVisiblePoints: 2 },
+      { minVisiblePoints: 2, maxZoomScale: null },
     )
     const { overlay, width, height } = prepareOverlay(
       wrapper,
@@ -151,7 +151,7 @@ describe('WaveformChart point-aware zoom constraints', () => {
     expect(visibleXCount(constrainedDomain)).toBe(2)
   })
 
-  it('retains the default 40x maximum when no explicit limit is configured', async () => {
+  it('retains the backwards-compatible default maximum zoom scale', async () => {
     const wrapper = await mountSizedChart({ kind: 'points', points: regularPoints })
     const { overlay, width, height } = prepareOverlay(
       wrapper,
@@ -163,6 +163,66 @@ describe('WaveformChart point-aware zoom constraints', () => {
     expect(domain[1] - domain[0]).toBeCloseTo(1_199 / 40)
   })
 
+  it('honors an explicit maximum zoom scale', async () => {
+    const wrapper = await mountSizedChart(
+      { kind: 'points', points: regularPoints },
+      { maxZoomScale: 20 },
+    )
+    const { overlay, width, height } = prepareOverlay(
+      wrapper,
+      '.waveform-chart__overlay--independent',
+    )
+
+    await dispatchWheel(overlay, width, height, -4_000)
+    const domain = wrapper.emitted('zoom-change')?.at(-1)?.[0] as [number, number]
+    expect(domain[1] - domain[0]).toBeCloseTo(1_199 / 20)
+  })
+
+  it('disables the compatibility scale limit when configured with null', async () => {
+    const wrapper = await mountSizedChart(
+      { kind: 'points', points: regularPoints },
+      { maxZoomScale: null },
+    )
+    const { overlay, width, height } = prepareOverlay(
+      wrapper,
+      '.waveform-chart__overlay--independent',
+    )
+
+    await dispatchWheel(overlay, width, height, -4_000)
+    const domain = wrapper.emitted('zoom-change')?.at(-1)?.[0] as [number, number]
+    expect(domain[1] - domain[0]).toBeLessThan(1_199 / 40)
+  })
+
+  it('falls back to the compatibility limit for an invalid maximum scale', async () => {
+    const wrapper = await mountSizedChart(
+      { kind: 'points', points: regularPoints },
+      { maxZoomScale: 0 },
+    )
+    const { overlay, width, height } = prepareOverlay(
+      wrapper,
+      '.waveform-chart__overlay--independent',
+    )
+
+    await dispatchWheel(overlay, width, height, -4_000)
+    const domain = wrapper.emitted('zoom-change')?.at(-1)?.[0] as [number, number]
+    expect(domain[1] - domain[0]).toBeCloseTo(1_199 / 40)
+  })
+
+  it('uses the strictest configured zoom constraint', async () => {
+    const wrapper = await mountSizedChart(
+      { kind: 'points', points: regularPoints },
+      { minZoomSpan: 50, minVisiblePoints: 2, maxZoomScale: 40 },
+    )
+    const { overlay, width, height } = prepareOverlay(
+      wrapper,
+      '.waveform-chart__overlay--independent',
+    )
+
+    await dispatchWheel(overlay, width, height, -4_000)
+    const domain = wrapper.emitted('zoom-change')?.at(-1)?.[0] as [number, number]
+    expect(domain[1] - domain[0]).toBeCloseTo(50)
+  })
+
   it('retains two endpoint samples while replacing an independent data window', async () => {
     const sourcePoints = Array.from({ length: 1_000 }, (_, index) => ({
       x: -5 + (index * 10) / 999,

package/src/views/WasmSamplingDemo.vue

@@ -68,6 +68,7 @@ const mode = ref<WaveformSamplingMode>('auto')
 const strategy = ref<WaveformSamplingStrategy>('peak')
 const autoThreshold = ref(1_000)
 const maxPointsPerPixel = ref(3)
+const minVisiblePoints = ref(2)
 const diagnostics = reactive<Record<string, WaveformSamplingDiagnostics | undefined>>({})
 
 const rendering = computed<WaveformRenderingOptions>(() => ({
@@ -135,6 +136,10 @@ function pointCount(value: number | undefined) {
           size="small"
         />
       </label>
+      <label>
+        <span>最少可见点</span>
+        <InputNumber v-model:value="minVisiblePoints" :min="2" :max="1000" :step="1" size="small" />
+      </label>
     </section>
 
     <section class="sampling-demo__workspace">
@@ -144,6 +149,8 @@ function pointCount(value: number | undefined) {
           :rendering="rendering"
           :grid="{ rowCount: 1, columnCount: 1, showPagination: false }"
           :legend="{ position: 'top-right', orientation: 'vertical' }"
+          :max-zoom-scale="null"
+          :min-visible-points="minVisiblePoints"
           :title="{ visible: true, text: '多系列采样与缓存诊断', align: 'left' }"
           x-label="时间（s）"
           time-unit="s"