@blibliki/engine 0.1.5 → 0.1.6

package/build/Module/Volume.js

@@ -1,15 +1,14 @@
 import { Volume as Vol } from "tone";
-import Module, { ModuleType } from "../Module";
-import PolyModule, { PolyModuleType } from "./PolyModule";
+import Module from "./Base";
+import PolyModule from "./PolyModule";
 const InitialProps = {
     volume: -100,
 };
-export default class Volume extends Module {
+class MonoVolume extends Module {
     constructor(name, props) {
         super(new Vol(), {
             name,
             props: { ...InitialProps, ...props },
-            type: ModuleType.Volume,
         });
     }
     get volume() {
@@ -20,12 +19,12 @@ export default class Volume extends Module {
         this.internalModule.volume.value = this.volume;
     }
 }
-export class PolyVolume extends PolyModule {
+export default class Volume extends PolyModule {
     constructor(name, props) {
-        super(PolyModuleType.Volume, {
+        super({
             name,
+            child: MonoVolume,
             props: { ...InitialProps, ...props },
-            type: ModuleType.Volume,
         });
         this.registerBasicInputs();
         this.registerBasicOutputs();

package/build/Module/Volume.js.map

@@ -1 +1 @@
-{"version":3,"file":"Volume.js","sourceRoot":"","sources":["../../src/Module/Volume.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,GAAG,EAAE,MAAM,MAAM,CAAC;AAErC,OAAO,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,UAAU,EAAE,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAO1D,MAAM,YAAY,GAAoB;IACpC,MAAM,EAAE,CAAC,GAAG;CACb,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,MAA4B;IAC9D,YAAY,IAAY,EAAE,KAA+B;QACvD,KAAK,CAAC,IAAI,GAAG,EAAE,EAAE;YACf,IAAI;YACJ,KAAK,EAAE,EAAE,GAAG,YAAY,EAAE,GAAG,KAAK,EAAE;YACpC,IAAI,EAAE,UAAU,CAAC,MAAM;SACxB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,MAAM,CAAC,KAAa;QACtB,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAE/C,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;IACjD,CAAC;CACF;AAED,MAAM,OAAO,UAAW,SAAQ,UAAmC;IACjE,YAAY,IAAY,EAAE,KAA+B;QACvD,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE;YAC3B,IAAI;YACJ,KAAK,EAAE,EAAE,GAAG,YAAY,EAAE,GAAG,KAAK,EAAE;YACpC,IAAI,EAAE,UAAU,CAAC,MAAM;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;CACF"}
+{"version":3,"file":"Volume.js","sourceRoot":"","sources":["../../src/Module/Volume.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,GAAG,EAAE,MAAM,MAAM,CAAC;AAErC,OAAO,MAAoB,MAAM,QAAQ,CAAC;AAC1C,OAAO,UAAU,MAAM,cAAc,CAAC;AAMtC,MAAM,YAAY,GAAoB;IACpC,MAAM,EAAE,CAAC,GAAG;CACb,CAAC;AAEF,MAAM,UAAW,SAAQ,MAA4B;IACnD,YAAY,IAAY,EAAE,KAA+B;QACvD,KAAK,CAAC,IAAI,GAAG,EAAE,EAAE;YACf,IAAI;YACJ,KAAK,EAAE,EAAE,GAAG,YAAY,EAAE,GAAG,KAAK,EAAE;SACrC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,MAAM,CAAC,KAAa;QACtB,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAE/C,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;IACjD,CAAC;CACF;AAED,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAuC;IACzE,YAAY,IAAY,EAAE,KAA+B;QACvD,KAAK,CAAC;YACJ,IAAI;YACJ,KAAK,EAAE,UAAU;YACjB,KAAK,EAAE,EAAE,GAAG,YAAY,EAAE,GAAG,KAAK,EAAE;SACrC,CAAC,CAAC;QAEH,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;CACF"}

package/build/Module/index.d.ts

@@ -1,25 +1,10 @@
 import Module, { Connectable } from "./Base";
 import PolyModule from "./PolyModule";
-import Oscillator, { PolyOscillator } from "./Oscillator";
-import { Envelope, AmpEnvelope } from "./Envelope";
-import Filter, { PolyFilter } from "./Filter";
-import Master from "./Master";
-import VoiceScheduler, { Voice } from "./VoiceScheduler";
-import MidiSelector from "./MidiSelector";
-import { PolyAmpEnvelope } from "./Envelope/AmpEnvelope";
-import { PolyEnvelope } from "./Envelope/Base";
-import Volume, { PolyVolume } from "./Volume";
-import VirtualMidi from "./VirtualMidi";
-import Reverb from "./Reverb";
-import Delay from "./Delay";
-import Distortion from "./Distortion";
-import BitCrusher from "./BitCrusher";
-export { default, ModuleType } from "./Base";
-export { default as PolyModule, PolyModuleType } from "./PolyModule";
+export { default } from "./Base";
+export { default as PolyModule } from "./PolyModule";
 export type { ModuleInterface, Connectable, Triggerable } from "./Base";
 export { default as Filter } from "./Filter";
 export { default as Oscillator } from "./Oscillator";
 export { Envelope, AmpEnvelope, FreqEnvelope, EnvelopeStages, } from "./Envelope";
 export declare type AudioModule = Module<Connectable, any> | PolyModule<Module<Connectable, any>, any>;
 export declare function createModule(name: string, type: string, props: any): AudioModule;
-export declare function moduleClassFromType(type: string): typeof Reverb | typeof Delay | typeof Distortion | typeof BitCrusher | typeof Oscillator | typeof Envelope | typeof AmpEnvelope | typeof Filter | typeof Volume | typeof PolyOscillator | typeof PolyEnvelope | typeof PolyAmpEnvelope | typeof PolyFilter | typeof PolyVolume | typeof Master | typeof Voice | typeof VoiceScheduler | typeof MidiSelector | typeof VirtualMidi;

package/build/Module/index.js

@@ -1,22 +1,18 @@
-import { ModuleType } from "./Base";
-import { PolyModuleType } from "./PolyModule";
-import Oscillator, { PolyOscillator } from "./Oscillator";
+import { camelCase, upperFirst } from "lodash";
+import Oscillator from "./Oscillator";
 import { Envelope, AmpEnvelope, FreqEnvelope } from "./Envelope";
-import Filter, { PolyFilter } from "./Filter";
+import Filter from "./Filter";
 import Master from "./Master";
-import VoiceScheduler, { Voice } from "./VoiceScheduler";
+import VoiceScheduler from "./VoiceScheduler";
 import MidiSelector from "./MidiSelector";
-import { PolyAmpEnvelope } from "./Envelope/AmpEnvelope";
-import { PolyFreqEnvelope } from "./Envelope/FreqEnvelope";
-import { PolyEnvelope } from "./Envelope/Base";
-import Volume, { PolyVolume } from "./Volume";
+import Volume from "./Volume";
 import VirtualMidi from "./VirtualMidi";
 import Reverb from "./Reverb";
 import Delay from "./Delay";
 import Distortion from "./Distortion";
 import BitCrusher from "./BitCrusher";
-export { default, ModuleType } from "./Base";
-export { default as PolyModule, PolyModuleType } from "./PolyModule";
+export { default } from "./Base";
+export { default as PolyModule } from "./PolyModule";
 export { default as Filter } from "./Filter";
 export { default as Oscillator } from "./Oscillator";
 export { Envelope, AmpEnvelope, FreqEnvelope, EnvelopeStages, } from "./Envelope";
@@ -24,52 +20,39 @@ export function createModule(name, type, props) {
     const klass = moduleClassFromType(type);
     return new klass(name, props);
 }
-export function moduleClassFromType(type) {
+function moduleClassFromType(type) {
+    type = upperFirst(camelCase(type));
     switch (type) {
-        case ModuleType.Oscillator:
+        case Oscillator.name:
             return Oscillator;
-        case ModuleType.Envelope:
+        case Envelope.name:
             return Envelope;
-        case ModuleType.AmpEnvelope:
+        case AmpEnvelope.name:
             return AmpEnvelope;
-        case ModuleType.FreqEnvelope:
+        case FreqEnvelope.name:
             return FreqEnvelope;
-        case ModuleType.Filter:
+        case Filter.name:
             return Filter;
-        case ModuleType.Volume:
+        case Volume.name:
             return Volume;
-        case PolyModuleType.Oscillator:
-            return PolyOscillator;
-        case PolyModuleType.Envelope:
-            return PolyEnvelope;
-        case PolyModuleType.AmpEnvelope:
-            return PolyAmpEnvelope;
-        case PolyModuleType.FreqEnvelope:
-            return PolyFreqEnvelope;
-        case PolyModuleType.Filter:
-            return PolyFilter;
-        case PolyModuleType.Volume:
-            return PolyVolume;
-        case ModuleType.Master:
+        case Master.name:
             return Master;
-        case ModuleType.Voice:
-            return Voice;
-        case PolyModuleType.VoiceScheduler:
+        case VoiceScheduler.name:
             return VoiceScheduler;
-        case ModuleType.MidiSelector:
+        case MidiSelector.name:
             return MidiSelector;
-        case ModuleType.VirtualMidi:
+        case VirtualMidi.name:
             return VirtualMidi;
-        case ModuleType.Reverb:
+        case Reverb.name:
             return Reverb;
-        case ModuleType.Delay:
+        case Delay.name:
             return Delay;
-        case ModuleType.Distortion:
+        case Distortion.name:
             return Distortion;
-        case ModuleType.BitCrusher:
+        case BitCrusher.name:
             return BitCrusher;
         default:
-            throw Error("Unknown module type");
+            throw Error(`Unknown module type ${type}`);
     }
 }
 //# sourceMappingURL=index.js.map

package/build/Module/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Module/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Module/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAG/C,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAGrD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EACL,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,cAAc,GACf,MAAM,YAAY,CAAC;AAMpB,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,IAAY,EACZ,KAAU;IAEV,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAExC,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY;IACvC,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnC,QAAQ,IAAI,EAAE;QACZ,KAAK,UAAU,CAAC,IAAI;YAClB,OAAO,UAAU,CAAC;QACpB,KAAK,QAAQ,CAAC,IAAI;YAChB,OAAO,QAAQ,CAAC;QAClB,KAAK,WAAW,CAAC,IAAI;YACnB,OAAO,WAAW,CAAC;QACrB,KAAK,YAAY,CAAC,IAAI;YACpB,OAAO,YAAY,CAAC;QACtB,KAAK,MAAM,CAAC,IAAI;YACd,OAAO,MAAM,CAAC;QAChB,KAAK,MAAM,CAAC,IAAI;YACd,OAAO,MAAM,CAAC;QAChB,KAAK,MAAM,CAAC,IAAI;YACd,OAAO,MAAM,CAAC;QAChB,KAAK,cAAc,CAAC,IAAI;YACtB,OAAO,cAAc,CAAC;QACxB,KAAK,YAAY,CAAC,IAAI;YACpB,OAAO,YAAY,CAAC;QACtB,KAAK,WAAW,CAAC,IAAI;YACnB,OAAO,WAAW,CAAC;QACrB,KAAK,MAAM,CAAC,IAAI;YACd,OAAO,MAAM,CAAC;QAChB,KAAK,KAAK,CAAC,IAAI;YACb,OAAO,KAAK,CAAC;QACf,KAAK,UAAU,CAAC,IAAI;YAClB,OAAO,UAAU,CAAC;QACpB,KAAK,UAAU,CAAC,IAAI;YAClB,OAAO,UAAU,CAAC;QACpB;YACE,MAAM,KAAK,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC;KAC9C;AACH,CAAC"}

package/build/index.d.ts

@@ -1,5 +1,4 @@
 export { default } from "./Engine";
-export { ModuleType, PolyModuleType } from "./Module";
 export { default as MidiDevice } from "./MidiDevice";
 export { default as MidiDeviceManager } from "./MidiDeviceManager";
 export { default as Note } from "./Note";

package/build/index.js

@@ -1,5 +1,4 @@
 export { default } from "./Engine";
-export { ModuleType, PolyModuleType } from "./Module";
 export { default as MidiDevice } from "./MidiDevice";
 export { default as MidiDeviceManager } from "./MidiDeviceManager";
 export { default as Note } from "./Note";

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,QAAQ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,QAAQ,CAAC"}

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@blibliki/engine",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "dependencies": {
+    "@types/lodash": "^4.14.186",
+    "lodash": "^4.17.21",
     "tone": "^14.7.77",
     "uuid": "^8.3.2"
   },

package/src/Engine.ts

@@ -2,7 +2,6 @@ import { Context, setContext } from "tone";
 import MidiDeviceManager from "./MidiDeviceManager";
 import MidiEvent from "./MidiEvent";
 
-import { ModuleType } from "./Module";
 import { AudioModule, createModule } from "./Module";
 import Master from "./Module/Master";
 import VirtualMidi from "./Module/VirtualMidi";
@@ -112,11 +111,7 @@ class Engine {
   get master() {
     if (this._master) return this._master.serialize();
 
-    const masterProps = this.registerModule(
-      "Master",
-      "master",
-      ModuleType.Master
-    );
+    const masterProps = this.registerModule("Master", "Master");
     this._master = this.modules[masterProps.id] as Master;
 
     return masterProps;
@@ -130,7 +125,7 @@ class Engine {
 
   dispose() {
     Object.values(this.modules).forEach((m) => {
-      if (m.type === "master") return;
+      if (m.constructor.name === "Master") return;
 
       m.dispose();
     });

package/src/Module/Base.ts

@@ -5,23 +5,6 @@ import { Input, Output, IOInterface } from "./IO";
 import MidiEvent from "../MidiEvent";
 import { AudioModule, PolyModule } from "../Module";
 
-export enum ModuleType {
-  Oscillator = "monoOscillator",
-  Envelope = "monoEnvelope",
-  AmpEnvelope = "monoAmpEnvelope",
-  FreqEnvelope = "monoFreqEnvelope",
-  Filter = "monoFilter",
-  Master = "master",
-  Voice = "voice",
-  MidiSelector = "midiSelector",
-  VirtualMidi = "virtualMidi",
-  Volume = "monoVolume",
-  Reverb = "reverb",
-  Delay = "delay",
-  Distortion = "distortion",
-  BitCrusher = "bitCrusher",
-}
-
 export interface Connectable {
   connect: (inputNode: InputNode) => void;
   disconnect: (inputNode?: InputNode) => void;
@@ -33,9 +16,12 @@ export interface Triggerable {
   triggerRelease: Function;
 }
 
+export interface Voicable {
+  voiceNo?: number;
+}
+
 export interface ModuleInterface {
   name: string;
-  type: ModuleType;
   props?: { [key: string]: any };
   voiceNo?: number;
 }
@@ -59,7 +45,6 @@ class Module<InternalModule extends Connectable, PropsInterface>
   name: string;
   inputs: Input[] = [];
   outputs: Output[] = [];
-  type: ModuleType;
   readonly voiceNo?: number;
   updatedAt: Date;
   _props: PropsInterface;
@@ -160,7 +145,7 @@ class Module<InternalModule extends Connectable, PropsInterface>
     return {
       id: this.id,
       name: this.name,
-      type: this.type,
+      type: this.constructor.name,
       props: this.props,
       inputs: this.inputs.map((i) => i.serialize()),
       outputs: this.outputs.map((i) => i.serialize()),

package/src/Module/BitCrusher.ts

@@ -1,6 +1,5 @@
 import { BitCrusher as InternalBitCrasher } from "tone";
 
-import { ModuleType } from "./Base";
 import Effect, { EffectInterface } from "./Effect";
 
 interface BitCrusherInterface extends EffectInterface {
@@ -11,12 +10,12 @@ const InitialProps: Partial<BitCrusherInterface> = {
   bits: 16,
 };
 
-export default class Delay extends Effect<
+export default class BitCrusher extends Effect<
   InternalBitCrasher,
   BitCrusherInterface
 > {
   constructor(name: string, props: Partial<BitCrusherInterface>) {
-    super(name, ModuleType.BitCrusher, new InternalBitCrasher(), {
+    super(name, new InternalBitCrasher(), {
       ...InitialProps,
       ...props,
     });

package/src/Module/Delay.ts

@@ -1,6 +1,5 @@
 import { FeedbackDelay } from "tone";
 
-import { ModuleType } from "./Base";
 import Effect, { EffectInterface } from "./Effect";
 
 interface DelayInterface extends EffectInterface {
@@ -15,7 +14,7 @@ const InitialProps: Partial<DelayInterface> = {
 
 export default class Delay extends Effect<FeedbackDelay, DelayInterface> {
   constructor(name: string, props: Partial<DelayInterface>) {
-    super(name, ModuleType.Delay, new FeedbackDelay(), {
+    super(name, new FeedbackDelay(), {
       ...InitialProps,
       ...props,
     });

package/src/Module/Distortion.ts

@@ -1,6 +1,5 @@
 import { Distortion as InternalDistortion } from "tone";
 
-import { ModuleType } from "./Base";
 import Effect, { EffectInterface } from "./Effect";
 
 interface DistortionInterface extends EffectInterface {
@@ -16,7 +15,7 @@ export default class Distortion extends Effect<
   DistortionInterface
 > {
   constructor(name: string, props: Partial<DistortionInterface>) {
-    super(name, ModuleType.Distortion, new InternalDistortion(), {
+    super(name, new InternalDistortion(), {
       ...InitialProps,
       ...props,
     });

package/src/Module/Effect.ts

@@ -1,5 +1,5 @@
 import { Signal } from "tone";
-import Module, { Connectable, ModuleType } from "./Base";
+import Module, { Connectable } from "./Base";
 
 interface EffectLike extends Connectable {
   wet: Signal<"normalRange">;
@@ -19,13 +19,11 @@ export default abstract class Effect<
 > extends Module<InternalEffect, ModuleInterface> {
   constructor(
     name: string,
-    type: ModuleType,
     internalModule: InternalEffect,
     props: Partial<ModuleInterface>
   ) {
     super(internalModule, {
       name,
-      type,
       props: { ...InitialProps, ...props },
     });
 

package/src/Module/Envelope/AmpEnvelope.ts

@@ -1,17 +1,15 @@
 import { AmplitudeEnvelope } from "tone";
 
-import { ModuleType } from "../index";
 import Base, { EnvelopeInterface, PolyBase } from "./Base";
-import { PolyModuleType } from "../PolyModule";
 
-export default class AmpEnvelope extends Base<AmplitudeEnvelope> {
+class MonoAmpEnvelope extends Base<AmplitudeEnvelope> {
   constructor(name: string, props: EnvelopeInterface) {
-    super(name, ModuleType.AmpEnvelope, new AmplitudeEnvelope(), props);
+    super(name, new AmplitudeEnvelope(), props);
   }
 }
 
-export class PolyAmpEnvelope extends PolyBase<AmpEnvelope> {
+export default class AmpEnvelope extends PolyBase<MonoAmpEnvelope> {
   constructor(name: string, props: Partial<EnvelopeInterface>) {
-    super(name, ModuleType.AmpEnvelope, PolyModuleType.AmpEnvelope, props);
+    super(name, MonoAmpEnvelope, props);
   }
 }

package/src/Module/Envelope/Base.ts

@@ -1,7 +1,7 @@
 import { Envelope as Env } from "tone";
 
-import Module, { ModuleType, Connectable, Triggerable } from "../index";
-import PolyModule, { PolyModuleType } from "../PolyModule";
+import Module, { Connectable, Triggerable, Voicable } from "../Base";
+import PolyModule from "../PolyModule";
 import MidiEvent from "../../MidiEvent";
 
 export const enum EnvelopeStages {
@@ -16,7 +16,7 @@ const MIN_TIME = 0.01;
 const SUSTAIN_MAX_VALUE = 1;
 const SUSTAIN_MIN_VALUE = 0;
 
-export interface EnvelopeInterface {
+export interface EnvelopeInterface extends Voicable {
   attack: number;
   decay: number;
   sustain: number;
@@ -40,13 +40,11 @@ export default abstract class EnvelopeModule<EnvelopeLike extends Env>
 
   constructor(
     name: string,
-    type: ModuleType,
     internalModule: EnvelopeLike,
     props: EnvelopeInterface
   ) {
     super(internalModule, {
       name,
-      type,
       props: { ...InitialProps, ...props },
     });
   }
@@ -120,13 +118,12 @@ export abstract class PolyBase<
 > extends PolyModule<EnvelopeModule, EnvelopeInterface> {
   constructor(
     name: string,
-    type: ModuleType,
-    polyType: PolyModuleType,
+    child: new (name: string, props: EnvelopeInterface) => EnvelopeModule,
     props: Partial<EnvelopeInterface>
   ) {
-    super(polyType, {
+    super({
       name,
-      type,
+      child,
       props: { ...InitialProps, ...props },
     });
 
@@ -143,15 +140,15 @@ export abstract class PolyBase<
   }
 }
 
-export class Envelope extends EnvelopeModule<Env> {
+class MonoEnvelope extends EnvelopeModule<Env> {
   constructor(name: string, props: EnvelopeInterface) {
-    super(name, ModuleType.Envelope, new Env(), props);
+    super(name, new Env(), props);
   }
 }
 
-export class PolyEnvelope extends PolyBase<Envelope> {
+export class Envelope extends PolyBase<MonoEnvelope> {
   constructor(name: string, props: Partial<EnvelopeInterface>) {
-    super(name, ModuleType.Envelope, PolyModuleType.Envelope, {
+    super(name, MonoEnvelope, {
       ...InitialProps,
       ...props,
     });

package/src/Module/Envelope/FreqEnvelope.ts

@@ -1,9 +1,7 @@
 import { FrequencyEnvelope } from "tone";
 
-import { ModuleType } from "../Base";
 import Filter from "../Filter";
 import { Output } from "../IO";
-import { PolyModuleType } from "../PolyModule";
 
 import Base, { EnvelopeInterface, PolyBase } from "./Base";
 
@@ -15,13 +13,13 @@ const InitialProps: FreqEnvelopeInterface = {
   amount: 0,
 };
 
-export default class FreqEnvelope extends Base<FrequencyEnvelope> {
+export class MonoFreqEnvelope extends Base<FrequencyEnvelope> {
   private _frequency: number;
   private _amount: number;
   filter: Filter;
 
   constructor(name: string, props: EnvelopeInterface) {
-    super(name, ModuleType.FreqEnvelope, new FrequencyEnvelope(), {
+    super(name, new FrequencyEnvelope(), {
       ...InitialProps,
       ...props,
     });
@@ -47,9 +45,9 @@ export default class FreqEnvelope extends Base<FrequencyEnvelope> {
   }
 }
 
-export class PolyFreqEnvelope extends PolyBase<FreqEnvelope> {
+export default class FreqEnvelope extends PolyBase<MonoFreqEnvelope> {
   constructor(name: string, props: Partial<EnvelopeInterface>) {
-    super(name, ModuleType.FreqEnvelope, PolyModuleType.FreqEnvelope, props);
+    super(name, MonoFreqEnvelope, props);
 
     this.registerOutputs();
   }

package/src/Module/Envelope/index.ts

@@ -1,3 +1,3 @@
 export { default, Envelope, EnvelopeStages } from "./Base";
 export { default as AmpEnvelope } from "./AmpEnvelope";
-export { default as FreqEnvelope } from "./FreqEnvelope";
+export { default as FreqEnvelope, MonoFreqEnvelope } from "./FreqEnvelope";

package/src/Module/Filter.ts

@@ -1,12 +1,12 @@
 import { Filter as InternalFilter } from "tone";
 
-import { FreqEnvelope } from "./Envelope";
-import Module, { ModuleType } from "./Base";
-import PolyModule, { PolyModuleType } from "./PolyModule";
-import { PolyFreqEnvelope } from "./Envelope/FreqEnvelope";
+import { FreqEnvelope, MonoFreqEnvelope } from "./Envelope";
+import Module, { Voicable } from "./Base";
+import PolyModule from "./PolyModule";
 
-interface FilterInterface {
+interface FilterInterface extends Voicable {
   cutoff: number;
+  filterType: BiquadFilterType;
   resonance: number;
   envelopeAmount: number;
   voiceNo?: number;
@@ -18,16 +18,16 @@ const InitialProps: FilterInterface = {
   cutoff: 20000,
   resonance: 0,
   envelopeAmount: 0,
+  filterType: "lowpass",
 };
 
-export default class Filter extends Module<InternalFilter, FilterInterface> {
-  private _envelope: FreqEnvelope;
+class MonoFilter extends Module<InternalFilter, FilterInterface> {
+  private _envelope: MonoFreqEnvelope;
 
   constructor(name: string, props: FilterProps) {
     super(new InternalFilter({ type: "lowpass" }), {
       name,
       props: { ...InitialProps, ...props },
-      type: ModuleType.Filter,
     });
   }
 
@@ -71,19 +71,19 @@ export default class Filter extends Module<InternalFilter, FilterInterface> {
     this._envelope.amount = value;
   }
 
-  conntectedEnvelope(envelope: FreqEnvelope) {
+  conntectedEnvelope(envelope: MonoFreqEnvelope) {
     this._envelope = envelope;
     this._envelope.frequency = this.cutoff;
     this._envelope.amount = this.envelopeAmount;
   }
 }
 
-export class PolyFilter extends PolyModule<Filter, FilterInterface> {
+export default class Filter extends PolyModule<MonoFilter, FilterInterface> {
   constructor(name: string, props: Partial<FilterInterface>) {
-    super(PolyModuleType.Filter, {
+    super({
       name,
+      child: MonoFilter,
       props: { ...InitialProps, ...props },
-      type: ModuleType.Filter,
     });
 
     this.registerBasicInputs();
@@ -96,13 +96,13 @@ export class PolyFilter extends PolyModule<Filter, FilterInterface> {
       name: "frequency",
       pluggable: "frequency",
       onPlug: (output) => {
-        this.conntectedEnvelope(output.audioModule as PolyFreqEnvelope);
+        this.conntectedEnvelope(output.audioModule as FreqEnvelope);
       },
     });
   }
 
-  conntectedEnvelope(polyFreqEnvelope: PolyFreqEnvelope) {
-    polyFreqEnvelope.audioModules.forEach((envelope) => {
+  conntectedEnvelope(freqEnvelope: FreqEnvelope) {
+    freqEnvelope.audioModules.forEach((envelope) => {
       if (envelope.voiceNo === undefined) return;
 
       const filter = this.findVoice(envelope.voiceNo);

package/src/Module/Master.ts

@@ -1,5 +1,5 @@
 import { Destination, getDestination } from "tone";
-import Module, { ModuleType } from "../Module";
+import Module from "./Base";
 
 export interface MasterInterface {}
 
@@ -10,7 +10,6 @@ export default class Master extends Module<
   constructor() {
     super(getDestination(), {
       name: "Master",
-      type: ModuleType.Master,
     });
 
     this.registerBasicInputs();