waveform-analysis 0.1.53 → 0.1.54

package/README.md

@@ -855,7 +855,8 @@ Worker 的 JavaScript 回退后端和 Rust/WASM 后端都按需建立多分辨
 同步释放其索引与缓存项。`sampling-complete.cacheHit` 只在 Worker 实际返回该缓存项时为 `true`。
 
 演示可在 `#/wasm-sampling` 打开。该路由生成 10 条各 100,000 点的 `Float32Array` 通道，可切换
-`auto` / `wasm` / `raw`，所有采样策略、自动阈值和每条线最大渲染点数；右侧表格显示每个系列的真实后端、
+`auto` / `wasm` / `raw`，所有采样策略与自动阈值；Peak 类策略按每像素点数采样，LTTB、Average、
+Sum 按每条线的目标渲染点数采样。右侧表格显示每个系列的真实后端、
 源点/可见点/渲染点、耗时和缓存命中状态。
 
 库产物会把 WASM 数据内联到 Worker 运行时，消费者无需额外复制 `.wasm` 文件。严格 CSP 部署

package/dist/types/views/wasmSamplingDemoSampling.d.ts

@@ -0,0 +1,6 @@
+import type { WaveformSamplingOptions, WaveformSamplingStrategy } from '../types';
+type SamplingSizeOptions = Pick<WaveformSamplingOptions, 'maxPointCount' | 'maxPointsPerPixel'>;
+export declare function usesFixedPointCount(strategy: WaveformSamplingStrategy): boolean;
+export declare function showsSamplingSize(strategy: WaveformSamplingStrategy): strategy is "auto" | "peak" | "lttb" | "average" | "min" | "max" | "minmax" | "sum";
+export declare function samplingSizeOptions(strategy: WaveformSamplingStrategy, maxPointsPerPixel: number, maxPointCount: number): SamplingSizeOptions;
+export {};

package/package.json

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

package/src/core/workerSampling/repositorySampling.test.ts

@@ -49,4 +49,58 @@ describe('WorkerSamplingRepository sampling targets', () => {
     if (response.type !== 'sample-viewport-response') return
     expect(response.results[0]?.diagnostics.renderedPointCount).toBeLessThanOrEqual(4)
   })
+
+  it.each(['lttb', 'average', 'sum'] as const)(
+    'returns exactly the fixed target for %s when enough points are visible',
+    (strategy) => {
+      const source = Array.from({ length: 100_000 }, (_, index) => ({
+        x: index,
+        y: Math.sin(index / 10),
+      }))
+      const repository = new WorkerSamplingRepository()
+      repository.handle({
+        type: 'register-dataset',
+        requestId: 1,
+        datasetId: strategy,
+        revision: 0,
+        points: source,
+      })
+      const response = repository.handle({
+        type: 'sample-viewport',
+        requestId: 2,
+        series: [
+          {
+            ...sampleSeries(strategy),
+            xDomain: [0, 99_999],
+            strategy,
+            maxPointCount: 1_000,
+          },
+        ],
+      })
+
+      expect(response).toMatchObject({
+        results: [{ diagnostics: { visiblePointCount: 100_000, renderedPointCount: 1_000 } }],
+      })
+    },
+  )
+
+  it('does not add points when the visible source has fewer than the fixed target', () => {
+    const repository = new WorkerSamplingRepository()
+    register(repository, 'small-target')
+    const response = repository.handle({
+      type: 'sample-viewport',
+      requestId: 3,
+      series: [
+        {
+          ...sampleSeries('small-target'),
+          strategy: 'lttb',
+          maxPointCount: 100,
+        },
+      ],
+    })
+
+    expect(response).toMatchObject({
+      results: [{ diagnostics: { visiblePointCount: 12, renderedPointCount: 12 } }],
+    })
+  })
 })

package/src/views/WasmSamplingDemo.vue

@@ -11,6 +11,11 @@ import type {
   WaveformSamplingMode,
   WaveformSamplingStrategy,
 } from '../types'
+import {
+  samplingSizeOptions,
+  showsSamplingSize,
+  usesFixedPointCount,
+} from './wasmSamplingDemoSampling'
 
 const SERIES_COUNT = 10
 const POINTS_PER_SERIES = 100_000
@@ -68,6 +73,7 @@ const data = createDenseData()
 const mode = ref<WaveformSamplingMode>('auto')
 const strategy = ref<WaveformSamplingStrategy>('peak')
 const autoThreshold = ref(1_000)
+const maxPointsPerPixel = ref(3)
 const maxPointCount = ref(1_000)
 const minVisiblePoints = ref(2)
 const annotations = ref<WaveformAnnotation[]>([])
@@ -78,7 +84,7 @@ const rendering = computed<WaveformRenderingOptions>(() => ({
     mode: mode.value,
     strategy: strategy.value,
     autoThreshold: autoThreshold.value,
-    maxPointCount: maxPointCount.value,
+    ...samplingSizeOptions(strategy.value, maxPointsPerPixel.value, maxPointCount.value),
     rawPointLimit: 100_000,
     wasmFailureFallback: 'javascript',
   },
@@ -128,8 +134,8 @@ function pointCount(value: number | undefined) {
           size="small"
         />
       </label>
-      <label>
-        <span>最多渲染点</span>
+      <label v-if="usesFixedPointCount(strategy)">
+        <span>目标渲染点数</span>
         <InputNumber
           v-model:value="maxPointCount"
           :min="1"
@@ -138,6 +144,17 @@ function pointCount(value: number | undefined) {
           size="small"
         />
       </label>
+      <label v-else-if="showsSamplingSize(strategy)">
+        <span>每像素点数</span>
+        <InputNumber
+          v-model:value="maxPointsPerPixel"
+          :min="0.1"
+          :max="10"
+          :step="0.1"
+          size="small"
+        />
+      </label>
+      <span v-else class="sampling-demo__sampling-disabled">当前策略不执行降采样</span>
       <label>
         <span>最少可见点</span>
         <InputNumber v-model:value="minVisiblePoints" :min="2" :max="1000" :step="1" size="small" />

package/src/views/wasmSamplingDemoSampling.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  samplingSizeOptions,
+  showsSamplingSize,
+  usesFixedPointCount,
+} from './wasmSamplingDemoSampling'
+
+describe('WASM sampling demo sizing', () => {
+  it('uses pixel density for peak-oriented and extrema strategies', () => {
+    expect(samplingSizeOptions('auto', 3, 1_000)).toEqual({ maxPointsPerPixel: 3 })
+    expect(samplingSizeOptions('peak', 3, 1_000)).toEqual({ maxPointsPerPixel: 3 })
+    expect(samplingSizeOptions('minmax', 3, 1_000)).toEqual({ maxPointsPerPixel: 3 })
+  })
+
+  it('uses a fixed point count for LTTB and aggregate strategies', () => {
+    for (const strategy of ['lttb', 'average', 'sum'] as const) {
+      expect(usesFixedPointCount(strategy)).toBe(true)
+      expect(samplingSizeOptions(strategy, 3, 1_000)).toEqual({ maxPointCount: 1_000 })
+    }
+  })
+
+  it('does not show a sampling-size control or pass a size for none', () => {
+    expect(showsSamplingSize('none')).toBe(false)
+    expect(samplingSizeOptions('none', 3, 1_000)).toEqual({})
+  })
+})

package/src/views/wasmSamplingDemoSampling.ts

@@ -0,0 +1,23 @@
+import type { WaveformSamplingOptions, WaveformSamplingStrategy } from '../types'
+
+type SamplingSizeOptions = Pick<WaveformSamplingOptions, 'maxPointCount' | 'maxPointsPerPixel'>
+
+const fixedPointCountStrategies: readonly WaveformSamplingStrategy[] = ['lttb', 'average', 'sum']
+
+export function usesFixedPointCount(strategy: WaveformSamplingStrategy) {
+  return fixedPointCountStrategies.includes(strategy)
+}
+
+export function showsSamplingSize(strategy: WaveformSamplingStrategy) {
+  return strategy !== 'none'
+}
+
+export function samplingSizeOptions(
+  strategy: WaveformSamplingStrategy,
+  maxPointsPerPixel: number,
+  maxPointCount: number,
+): SamplingSizeOptions {
+  if (usesFixedPointCount(strategy)) return { maxPointCount }
+  if (!showsSamplingSize(strategy)) return {}
+  return { maxPointsPerPixel }
+}