refactor(dsp): update deps, imports, use new Fn types

thi-ng · Sep 5, 2020 · 683b4e9 · 683b4e9
1 parent 486cbcf
commit 683b4e9
Show file tree

Hide file tree

Showing 37 changed files with 68 additions and 76 deletions.
diff --git a/packages/dsp/package.json b/packages/dsp/package.json
@@ -40,6 +40,7 @@
     "devDependencies": {
         "@istanbuljs/nyc-config-typescript": "^1.0.1",
         "@microsoft/api-extractor": "^7.9.11",
+        "@thi.ng/api": "^6.12.3",
         "@types/mocha": "^8.0.3",
         "@types/node": "^14.6.1",
         "mocha": "^8.1.2",
@@ -49,7 +50,6 @@
         "typescript": "^4.0.2"
     },
     "dependencies": {
-        "@thi.ng/api": "^6.12.3",
         "@thi.ng/checks": "^2.7.7",
         "@thi.ng/errors": "^1.2.20",
         "@thi.ng/math": "^2.0.4",

diff --git a/packages/dsp/src/api.ts b/packages/dsp/src/api.ts
@@ -1,4 +1,4 @@
-import type { Fn2, IDeref, NumericArray } from "@thi.ng/api";
+import type { FnN2, IDeref, NumericArray } from "@thi.ng/api";
 
 export type StatelessOscillator = (
     phase: number,
@@ -10,7 +10,7 @@ export type StatelessOscillator = (
 
 export type ComplexArray = [NumericArray, NumericArray];
 
-export type WindowFn = Fn2<number, number, number>;
+export type WindowFn = FnN2;
 
 export interface IGen<T> extends Iterable<T>, IDeref<T> {
     next(): T;

diff --git a/packages/dsp/src/comp/addg.ts b/packages/dsp/src/comp/addg.ts
@@ -1,5 +1,5 @@
-import { MapG1 } from "./mapg";
 import type { IGen } from "../api";
+import { MapG1 } from "./mapg";
 
 /**
  * Creates a new {@link IGen} using given `step` gen and `start

diff --git a/packages/dsp/src/comp/compp.ts b/packages/dsp/src/comp/compp.ts
@@ -1,5 +1,5 @@
-import { AProc } from "../proc/aproc";
 import type { IProc } from "../api";
+import { AProc } from "../proc/aproc";
 
 export function compP<A, B, C>(a: IProc<A, B>, b: IProc<B, C>): IProc<A, C>;
 export function compP<A, B, C, D>(

diff --git a/packages/dsp/src/comp/mapg.ts b/packages/dsp/src/comp/mapg.ts
@@ -1,7 +1,7 @@
-import { illegalArity } from "@thi.ng/errors";
-import { AGen } from "../gen/agen";
 import type { Fn2, Fn3, Fn4, Fn5, FnAny } from "@thi.ng/api";
+import { illegalArity } from "@thi.ng/errors";
 import type { IGen } from "../api";
+import { AGen } from "../gen/agen";
 
 export function mapG<A, T>(op: Fn2<A, T, T>, a: IGen<A>, init: T): IGen<T>;
 export function mapG<A, B, T>(

diff --git a/packages/dsp/src/comp/multiplex.ts b/packages/dsp/src/comp/multiplex.ts
@@ -1,5 +1,5 @@
-import { AProc } from "../proc/aproc";
 import type { IProc } from "../api";
+import { AProc } from "../proc/aproc";
 
 export function multiplex<T, A, B>(
     a: IProc<T, A>,

diff --git a/packages/dsp/src/comp/pipe.ts b/packages/dsp/src/comp/pipe.ts
@@ -1,6 +1,6 @@
-import { MapG1 } from "./mapg";
 import type { FnAny } from "@thi.ng/api";
 import type { IGen, IProc } from "../api";
+import { MapG1 } from "./mapg";
 
 export function pipe<A, B>(src: IGen<A>, proc: IProc<A, B>): IGen<B>;
 export function pipe<A, B, C>(

diff --git a/packages/dsp/src/comp/product.ts b/packages/dsp/src/comp/product.ts
@@ -1,5 +1,5 @@
-import { MapG2, MapG3 } from "./mapg";
 import type { IGen } from "../api";
+import { MapG2, MapG3 } from "./mapg";
 
 /**
  * Higher order gen. Returns a {@link MapG2} or {@link MapG3} yielding

diff --git a/packages/dsp/src/comp/sum.ts b/packages/dsp/src/comp/sum.ts
@@ -1,5 +1,5 @@
-import { MapG2, MapG3 } from "./mapg";
 import type { IGen } from "../api";
+import { MapG2, MapG3 } from "./mapg";
 
 /**
  * Higher order gen. Returns a {@link MapG2} or {@link MapG3} yielding

diff --git a/packages/dsp/src/fft/fft.ts b/packages/dsp/src/fft/fft.ts
@@ -1,7 +1,7 @@
+import type { FnN3, NumericArray } from "@thi.ng/api";
 import { isNumber } from "@thi.ng/checks";
-import { magDb } from "../util/convert";
-import type { NumericArray } from "@thi.ng/api";
 import type { ComplexArray } from "../api";
+import { magDb } from "../util/convert";
 
 const PI = Math.PI;
 
@@ -333,7 +333,7 @@ export const spectrumPhase = (
  * @param fs - sample rate
  * @param n - window size
  */
-export const freqBin = (f: number, fs: number, n: number) => ((f * n) / fs) | 0;
+export const freqBin: FnN3 = (f, fs, n) => ((f * n) / fs) | 0;
 
 /**
  * Returns frequency for given FFT bin index, sample rate and window
@@ -343,7 +343,7 @@ export const freqBin = (f: number, fs: number, n: number) => ((f * n) / fs) | 0;
  * @param fs - sample rate
  * @param n - window size
  */
-export const binFreq = (bin: number, fs: number, n: number) => (bin * fs) / n;
+export const binFreq: FnN3 = (bin, fs, n) => (bin * fs) / n;
 
 /**
  * Returns array of bin center frequencies for given FFT window size and

diff --git a/packages/dsp/src/fft/window.ts b/packages/dsp/src/fft/window.ts
@@ -1,6 +1,6 @@
+import type { FloatArray, Fn, FnU3, FnU4 } from "@thi.ng/api";
 import { isNumber } from "@thi.ng/checks";
 import { PI, TAU } from "@thi.ng/math";
-import type { FloatArray } from "@thi.ng/api";
 import type { WindowFn } from "../api";
 
 // https://en.wikipedia.org/wiki/Window_function
@@ -31,33 +31,25 @@ export const windowRect: WindowFn = () => 1;
 
 export const windowSin: WindowFn = (i, n) => sin((PI * i) / n);
 
-export const windowSinPow = (k: number): WindowFn => (i, n) =>
+export const windowSinPow: Fn<number, WindowFn> = (k) => (i, n) =>
     sin((PI * i) / n) ** k;
 
 export const windowLanczos: WindowFn = (i, n) => {
     i = PI * ((2 * i) / n - 1);
     return sin(i) / i;
 };
 
-const windowCosSum = (k: number): WindowFn => {
+const windowCosSum: Fn<number, WindowFn> = (k) => {
     let ik = 1 - k;
     return (i, n) => k - ik * cos((TAU * i) / n);
 };
 
-const windowCosSum3 = (k1: number, k2: number, k3: number): WindowFn => (
-    i,
-    n
-) => {
+const windowCosSum3: FnU3<number, WindowFn> = (k1, k2, k3) => (i, n) => {
     i /= n;
     return k1 + k2 * cos(TAU * i) + k3 * cos(PI4 * i);
 };
 
-const windowCosSum4 = (
-    k1: number,
-    k2: number,
-    k3: number,
-    k4: number
-): WindowFn => (i, n) => {
+const windowCosSum4: FnU4<number, WindowFn> = (k1, k2, k3, k4) => (i, n) => {
     i /= n;
     return k1 + k2 * cos(TAU * i) + k3 * cos(PI4 * i) + k4 * cos(PI6 * i);
 };

diff --git a/packages/dsp/src/gen/add.ts b/packages/dsp/src/gen/add.ts
@@ -1,5 +1,5 @@
-import { AGen } from "./agen";
 import type { IReset } from "@thi.ng/api";
+import { AGen } from "./agen";
 
 /**
  * Creates a new `Add` gen using given `step` (default: 1) and `start

diff --git a/packages/dsp/src/gen/adsr.ts b/packages/dsp/src/gen/adsr.ts
@@ -1,9 +1,9 @@
+import type { IReset } from "@thi.ng/api";
 import { clamp01 } from "@thi.ng/math";
+import type { IGen } from "../api";
 import { add } from "./add";
 import { AGen } from "./agen";
 import { curve } from "./curve";
-import type { IReset } from "@thi.ng/api";
-import type { IGen } from "../api";
 
 const enum EnvPhase {
     ATTACK,

diff --git a/packages/dsp/src/gen/alt.ts b/packages/dsp/src/gen/alt.ts
@@ -1,5 +1,5 @@
-import { AGen } from "./agen";
 import type { IReset } from "@thi.ng/api";
+import { AGen } from "./agen";
 
 export const alt = (n = 1) => new Alt(n, -n);
 

diff --git a/packages/dsp/src/gen/cosine.ts b/packages/dsp/src/gen/cosine.ts
@@ -1,6 +1,6 @@
+import type { IReset } from "@thi.ng/api";
 import { TAU } from "@thi.ng/math";
 import { AGen } from "./agen";
-import type { IReset } from "@thi.ng/api";
 
 /**
  * Approximated cosine generator using given normalized `freq` and `amp`

diff --git a/packages/dsp/src/gen/impulse-train.ts b/packages/dsp/src/gen/impulse-train.ts
@@ -1,5 +1,5 @@
-import { AGen } from "./agen";
 import type { IReset } from "@thi.ng/api";
+import { AGen } from "./agen";
 
 /**
  * https://en.wikipedia.org/wiki/Dirac_comb

diff --git a/packages/dsp/src/gen/impulse.ts b/packages/dsp/src/gen/impulse.ts
@@ -1,5 +1,5 @@
-import { AGen } from "./agen";
 import type { IReset } from "@thi.ng/api";
+import { AGen } from "./agen";
 
 /**
  * Numeric version of {@link impulseT}, using given `on` (default: 1) as

diff --git a/packages/dsp/src/gen/madd.ts b/packages/dsp/src/gen/madd.ts
@@ -1,5 +1,5 @@
-import { AGen } from "./agen";
 import type { IReset } from "@thi.ng/api";
+import { AGen } from "./agen";
 
 /**
  * Returns new multiply-add gen producing `y(t) = factor * y(t-1) +

diff --git a/packages/dsp/src/gen/mul.ts b/packages/dsp/src/gen/mul.ts
@@ -1,5 +1,5 @@
-import { AGen } from "./agen";
 import type { IReset } from "@thi.ng/api";
+import { AGen } from "./agen";
 
 /**
  * Returns new multiply gen, producing `y(t) = factor * y(t-1)`, using

diff --git a/packages/dsp/src/gen/osc.ts b/packages/dsp/src/gen/osc.ts
@@ -1,9 +1,9 @@
 import { isNumber } from "@thi.ng/checks";
+import type { IGen, StatelessOscillator } from "../api";
 import { sum } from "../comp/sum";
 import { Add, add } from "./add";
 import { AGen } from "./agen";
 import { Const } from "./const";
-import type { IGen, StatelessOscillator } from "../api";
 
 /**
  * Higher order oscillator gen, wrapping a {@link StatelessOscillator}

diff --git a/packages/dsp/src/gen/pink-noise.ts b/packages/dsp/src/gen/pink-noise.ts
@@ -1,7 +1,6 @@
-import { SYSTEM } from "@thi.ng/random";
-import { AGen } from "./agen";
 import type { IReset, Tuple } from "@thi.ng/api";
-import type { IRandom } from "@thi.ng/random";
+import { IRandom, SYSTEM } from "@thi.ng/random";
+import { AGen } from "./agen";
 
 type PNoiseCoeffs = Tuple<number, 5>;
 const AMP = <PNoiseCoeffs>[3.8024, 2.9694, 2.597, 3.087, 3.4006];

diff --git a/packages/dsp/src/gen/reciprocal.ts b/packages/dsp/src/gen/reciprocal.ts
@@ -1,5 +1,5 @@
-import { AGen } from "./agen";
 import type { IReset } from "@thi.ng/api";
+import { AGen } from "./agen";
 
 /**
  * Returns a gen which yield sequence `y(t) = 1 / (y(t - 1) + step)`.

diff --git a/packages/dsp/src/gen/sincos.ts b/packages/dsp/src/gen/sincos.ts
@@ -1,6 +1,6 @@
+import type { IReset } from "@thi.ng/api";
 import { TAU } from "@thi.ng/math";
 import { AGen } from "./agen";
-import type { IReset } from "@thi.ng/api";
 
 /**
  * Generator of sine & cosine values of given frequency in the form of

diff --git a/packages/dsp/src/gen/white-noise.ts b/packages/dsp/src/gen/white-noise.ts
@@ -1,7 +1,6 @@
-import { SYSTEM } from "@thi.ng/random";
-import { AGen } from "./agen";
 import type { IReset } from "@thi.ng/api";
-import type { IRandom } from "@thi.ng/random";
+import { IRandom, SYSTEM } from "@thi.ng/random";
+import { AGen } from "./agen";
 
 /**
  * White noise gen with customizable gain and

diff --git a/packages/dsp/src/osc/additive.ts b/packages/dsp/src/osc/additive.ts
@@ -1,7 +1,7 @@
-import { gibbs } from "../util/anti-alias";
-import { sin } from "./sin";
 import type { Fn } from "@thi.ng/api";
 import type { StatelessOscillator } from "../api";
+import { gibbs } from "../util/anti-alias";
+import { sin } from "./sin";
 
 export const additive = (
     osc: StatelessOscillator,

diff --git a/packages/dsp/src/osc/wavetable.ts b/packages/dsp/src/osc/wavetable.ts
@@ -1,5 +1,5 @@
-import { fract, mix as _mix } from "@thi.ng/math";
 import type { Fn3, NumericArray } from "@thi.ng/api";
+import { fract, mix as _mix } from "@thi.ng/math";
 import type { StatelessOscillator } from "../api";
 
 export const wavetable = (

diff --git a/packages/dsp/src/proc/allpass.ts b/packages/dsp/src/proc/allpass.ts
@@ -1,6 +1,6 @@
+import type { IReset } from "@thi.ng/api";
 import { clamp05, PI, QUARTER_PI } from "@thi.ng/math";
 import { AProc } from "./aproc";
-import type { IReset } from "@thi.ng/api";
 
 /**
  * One-pole allpass filter.

diff --git a/packages/dsp/src/proc/aproc.ts b/packages/dsp/src/proc/aproc.ts
@@ -1,5 +1,5 @@
-import { map } from "@thi.ng/transducers";
 import type { IXform } from "@thi.ng/transducers";
+import { map } from "@thi.ng/transducers";
 import type { IProc, IProc2 } from "../api";
 
 /**

diff --git a/packages/dsp/src/proc/biquad.ts b/packages/dsp/src/proc/biquad.ts
@@ -1,10 +1,10 @@
+import type { IReset } from "@thi.ng/api";
 import { unsupported } from "@thi.ng/errors";
 import { clamp05, PI, SQRT2, SQRT2_2 } from "@thi.ng/math";
+import type { FilterConfig, IFilter } from "../api";
 import { FilterType } from "../constants";
 import { dbMag } from "../util/convert";
 import { AProc } from "./aproc";
-import type { IReset } from "@thi.ng/api";
-import type { FilterConfig, IFilter } from "../api";
 
 type BiquadType =
     | FilterType.LP

diff --git a/packages/dsp/src/proc/delay.ts b/packages/dsp/src/proc/delay.ts
@@ -1,7 +1,7 @@
+import type { Fn0, IClear, ILength, IReset } from "@thi.ng/api";
 import { isFunction } from "@thi.ng/checks";
 import { wrap } from "@thi.ng/math";
 import { AProc } from "./aproc";
-import type { Fn0, IClear, ILength, IReset } from "@thi.ng/api";
 
 /**
  * Delay line of length `n` for numeric values.

diff --git a/packages/dsp/src/proc/integrator.ts b/packages/dsp/src/proc/integrator.ts
@@ -1,5 +1,5 @@
-import { AProc } from "./aproc";
 import type { IReset } from "@thi.ng/api";
+import { AProc } from "./aproc";
 
 /**
  * Leaky integrator.

diff --git a/packages/dsp/src/proc/onepole.ts b/packages/dsp/src/proc/onepole.ts
@@ -1,8 +1,8 @@
+import type { IClear, IReset } from "@thi.ng/api";
 import { clamp05, TAU } from "@thi.ng/math";
+import type { FilterConfig, IFilter } from "../api";
 import { FilterType } from "../constants";
 import { AProc } from "./aproc";
-import type { IClear, IReset } from "@thi.ng/api";
-import type { FilterConfig, IFilter } from "../api";
 
 type OnepoleType = FilterType.LP | FilterType.HP;
 
@@ -13,7 +13,8 @@ export const onepoleHP = (fc: number) => new OnePole(FilterType.HP, fc);
 /**
  * https://www.earlevel.com/main/2012/12/15/a-one-pole-filter/
  */
-export class OnePole extends AProc<number, number>
+export class OnePole
+    extends AProc<number, number>
     implements IClear, IFilter, IReset {
     protected _a0!: number;
     protected _b1!: number;

diff --git a/packages/dsp/src/proc/svf.ts b/packages/dsp/src/proc/svf.ts
@@ -1,7 +1,7 @@
+import type { IReset } from "@thi.ng/api";
 import { clamp05, PI } from "@thi.ng/math";
 import { FilterType } from "../constants";
 import { AProc } from "./aproc";
-import type { IReset } from "@thi.ng/api";
 
 type SVFType =
     | FilterType.LP

diff --git a/packages/dsp/src/proc/waveshaper.ts b/packages/dsp/src/proc/waveshaper.ts
@@ -1,6 +1,6 @@
-import { foldback as _foldback, PI } from "@thi.ng/math";
-import { AProc } from "./aproc";
 import type { Fn2 } from "@thi.ng/api";
+import { PI } from "@thi.ng/math";
+import { AProc } from "./aproc";
 
 export type WaveShaperFn = Fn2<number, number, number>;
 

diff --git a/packages/dsp/src/util/anti-alias.ts b/packages/dsp/src/util/anti-alias.ts
@@ -1,3 +1,4 @@
+import type { FnN2 } from "@thi.ng/api";
 import { HALF_PI } from "@thi.ng/math";
 
 /**
@@ -11,8 +12,7 @@ import { HALF_PI } from "@thi.ng/math";
  * @param n - number of octaves
  * @param i - curr octave [1..n]
  */
-export const gibbs = (n: number, i: number) =>
-    Math.cos(((i - 1) * HALF_PI) / n) ** 2;
+export const gibbs: FnN2 = (n, i) => Math.cos(((i - 1) * HALF_PI) / n) ** 2;
 
 /**
  * Fejér weight for `k`-th harmonic in a Fourier series of length `n`.
@@ -25,7 +25,7 @@ export const gibbs = (n: number, i: number) =>
  * @param k -
  * @param n -
  */
-export const fejer = (k: number, n: number) => (n - k) / n;
+export const fejer: FnN2 = (k, n) => (n - k) / n;
 
 /**
  * Polynomial attenuation to create bandlimited version of a signal.
@@ -36,7 +36,7 @@ export const fejer = (k: number, n: number) => (n - k) / n;
  * @param dt - time step
  * @param t - normalized phase
  */
-export const polyBLEP = (dt: number, t: number) =>
+export const polyBLEP: FnN2 = (dt, t) =>
     t < dt
         ? ((t /= dt), t + t - t * t - 1)
         : t > 1 - dt