@blibliki/engine 0.1.25 → 0.1.27

package/src/core/Module/PolyModule.ts

@@ -3,19 +3,23 @@ import { v4 as uuidv4 } from "uuid";
 import Module, { Connectable } from "./MonoModule";
 import {
   IOCollection,
-  ForwardInput,
-  ForwardOutput,
   IOType,
   IMidiInput,
   IMidiOutput,
-  IForwardInput,
-  IForwardOutput,
   MidiOutput,
   MidiInput,
+  AnyInput,
+  AnyOuput,
+  ForwardAudioInput,
 } from "../IO";
 import { AudioModule } from "./index";
 import { plugCompatibleIO } from "../IO/Node";
 import { deterministicId } from "../../utils";
+import {
+  ForwardAudioOutput,
+  IForwardAudioInput,
+  IForwardAudioOutput,
+} from "../IO/ForwardNode";
 
 interface PolyModuleInterface<MonoAudioModule, PropsInterface> {
   id?: string;
@@ -43,8 +47,8 @@ export default abstract class PolyModule<
   }) => MonoAudioModule;
   _name: string;
   audioModules: MonoAudioModule[];
-  inputs: IOCollection<ForwardInput | MidiInput>;
-  outputs: IOCollection<ForwardOutput | MidiOutput>;
+  inputs: IOCollection<AnyInput>;
+  outputs: IOCollection<AnyOuput>;
   private _numberOfVoices: number;
 
   constructor(params: PolyModuleInterface<MonoAudioModule, PropsInterface>) {
@@ -58,8 +62,8 @@ export default abstract class PolyModule<
     Object.assign(this, basicProps);
 
     this.numberOfVoices = params.numberOfVoices || 1;
-    this.inputs = new IOCollection<ForwardInput>(this);
-    this.outputs = new IOCollection<ForwardOutput>(this);
+    this.inputs = new IOCollection<AnyInput>(this);
+    this.outputs = new IOCollection<AnyOuput>(this);
 
     Object.assign(this, { props: extraProps });
   }
@@ -147,14 +151,16 @@ export default abstract class PolyModule<
     return this.audioModules.find((m) => m.voiceNo === voiceNo);
   }
 
-  protected registerInput(props: Omit<IForwardInput, "ioType">): ForwardInput {
-    return this.inputs.add({ ...props, ioType: IOType.ForwardInput });
+  protected registerForwardAudioInput(
+    props: Omit<IForwardAudioInput, "ioType">
+  ): ForwardAudioInput {
+    return this.inputs.add({ ...props, ioType: IOType.ForwardAudioInput });
   }
 
-  protected registerOutput(
-    props: Omit<IForwardOutput, "ioType">
-  ): ForwardOutput {
-    return this.outputs.add({ ...props, ioType: IOType.ForwardOutput });
+  protected registerForwardAudioOutput(
+    props: Omit<IForwardAudioOutput, "ioType">
+  ): ForwardAudioOutput {
+    return this.outputs.add({ ...props, ioType: IOType.ForwardAudioOutput });
   }
 
   protected registerMidiInput(props: Omit<IMidiInput, "ioType">): MidiInput {
@@ -166,11 +172,15 @@ export default abstract class PolyModule<
   }
 
   protected registerBasicOutputs() {
-    this.registerOutput({ name: "output" });
+    this.registerForwardAudioOutput({ name: "output" });
   }
 
   protected registerBasicInputs() {
-    this.registerInput({ name: "input" });
+    this.registerForwardAudioInput({ name: "input" });
+    this.registerMidiIn();
+  }
+
+  protected registerMidiIn() {
     this.registerMidiInput({
       name: "midi in",
       onMidiEvent: this.onMidiEvent,

package/src/main.ts

@@ -0,0 +1 @@
+console.log("Hello from Blibliki");

package/src/modules/Filter.ts

@@ -143,6 +143,6 @@ export default class Filter extends PolyModule<MonoFilter, FilterInterface> {
 
   private registerOutputs() {
     this.registerBasicOutputs();
-    this.registerInput({ name: "cutoff" });
+    this.registerForwardAudioInput({ name: "cutoff" });
   }
 }

package/src/modules/LFO.ts

@@ -110,7 +110,6 @@ class MonoLFO extends Module<LFOInternal, LFOInterface> implements Startable {
   };
 
   private registerInputs() {
-    this.registerDefaultMidiInput();
     this.registerAudioInput({
       name: "amount",
       internalModule: this.internalModule.amplitude,
@@ -136,8 +135,8 @@ export default class LFO extends PolyModule<MonoLFO, LFOInterface> {
     });
 
     this.registerBasicOutputs();
-    this.registerInput({ name: "midi in" });
-    this.registerInput({ name: "amount" });
+    this.registerMidiIn();
+    this.registerForwardAudioInput({ name: "amount" });
   }
 
   start(time: number) {

package/src/modules/Oscillator.ts

@@ -1,4 +1,10 @@
-import { Multiply, now, Oscillator as Osc, ToneOscillatorType } from "tone";
+import {
+  Multiply,
+  now,
+  Oscillator as Osc,
+  Signal,
+  ToneOscillatorType,
+} from "tone";
 import Engine from "../Engine";
 
 import Note from "../core/Note";
@@ -24,12 +30,13 @@ const InitialProps: OscillatorInterface = {
   volume: 0,
 };
 
-class MonoOscillator
+export class MonoOscillator
   extends Module<Osc, OscillatorInterface>
   implements Startable
 {
   private _note: Note;
-  private _fineSignal: Multiply;
+  private _fineMulti: Multiply;
+  private _fineSignal: Signal;
 
   constructor(params: {
     id?: string;
@@ -75,8 +82,10 @@ class MonoOscillator
   get fineSingal() {
     if (this._fineSignal) return this._fineSignal;
 
-    this._fineSignal = new Multiply(100);
-    this._fineSignal.connect(this.internalModule.detune);
+    this._fineSignal = new Signal();
+    this._fineMulti = new Multiply(100);
+    this._fineSignal.connect(this._fineMulti);
+    this._fineMulti.connect(this.internalModule.detune);
 
     return this._fineSignal;
   }
@@ -171,7 +180,6 @@ class MonoOscillator
   }
 
   private registerInputs() {
-    this.registerDefaultMidiInput();
     this.registerAudioInput({
       name: "fine",
       internalModule: this.fineSingal,
@@ -200,8 +208,8 @@ export default class Oscillator extends PolyModule<
     });
 
     this.registerBasicOutputs();
-    this.registerInput({ name: "midi in" });
-    this.registerInput({ name: "fine" });
+    this.registerMidiIn();
+    this.registerForwardAudioInput({ name: "fine" });
   }
 
   start(time: number) {

package/src/modules/index.ts

@@ -1,5 +1,5 @@
 import { Envelope, AmpEnvelope, FreqEnvelope } from "./Envelope";
-import Oscillator from "./Oscillator";
+import Oscillator, { MonoOscillator } from "./Oscillator";
 import Filter from "./Filter";
 import Master from "./Master";
 import VoiceScheduler from "./VoiceScheduler";
@@ -16,7 +16,7 @@ import { AudioModule } from "../core/Module";
 
 export { default as Master } from "./Master";
 export { default as Filter } from "./Filter";
-export { default as Oscillator } from "./Oscillator";
+export { default as Oscillator, MonoOscillator } from "./Oscillator";
 export { default as VirtualMidi } from "./VirtualMidi";
 export { default as VoiceScheduler } from "./VoiceScheduler";
 export { default as Sequencer } from "./Sequencer";

package/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

package/dist/build/core/IO/ForwardNode.d.ts

@@ -1,38 +0,0 @@
-import IONode, { IOType, IIONode } from "./Node";
-import Module, { Connectable, PolyModule } from "../Module";
-import { AnyObject } from "../../types";
-import { AnyInput, AnyOuput } from ".";
-export interface IForwardInput extends IIONode {
-    ioType: IOType.ForwardInput;
-}
-export interface IForwardOutput extends IIONode {
-    ioType: IOType.ForwardOutput;
-}
-export declare class ForwardInput extends IONode implements IForwardInput {
-    plugableModule: PolyModule<Module<Connectable, AnyObject>, AnyObject>;
-    ioType: IOType.ForwardInput;
-    connections: ForwardOutput[];
-    constructor(plugableModule: PolyModule<Module<Connectable, AnyObject>, AnyObject>, props: IForwardInput);
-    get subInputs(): (import("./MidiNode").MidiInput | import("./AudioNode").AudioInput)[];
-    get subModules(): Module<Connectable, AnyObject>[];
-    subModule(voiceNo: number): Module<Connectable, AnyObject>;
-    subInput(voiceNo: number): import("./MidiNode").MidiInput | import("./AudioNode").AudioInput;
-    plug(io: AnyOuput, plugOther?: boolean): void;
-    unPlug(io: AnyOuput, plugOther?: boolean): void;
-    unPlugAll(): void;
-    private checkNameValidity;
-}
-export declare class ForwardOutput extends IONode implements IForwardOutput {
-    plugableModule: PolyModule<Module<Connectable, AnyObject>, AnyObject>;
-    ioType: IOType.ForwardOutput;
-    connections: ForwardInput[];
-    constructor(plugableModule: PolyModule<Module<Connectable, AnyObject>, AnyObject>, props: IForwardOutput);
-    get subOutputs(): (import("./MidiNode").MidiOutput | import("./AudioNode").AudioOutput)[];
-    get subModules(): Module<Connectable, AnyObject>[];
-    subModule(voiceNo: number): Module<Connectable, AnyObject>;
-    subOutput(voiceNo: number): import("./MidiNode").MidiOutput | import("./AudioNode").AudioOutput;
-    plug(io: AnyInput, plugOther?: boolean): void;
-    unPlug(io: AnyInput, plugOther?: boolean): void;
-    unPlugAll(): void;
-    private checkNameValidity;
-}

package/dist/build/core/IO/index.d.ts

@@ -1,12 +0,0 @@
-import { default as IOCollection } from "./Collection";
-import { IIONode, IOType, IIOSerialize } from "./Node";
-import { AudioInput, AudioOutput, IAudioInput, IAudioOutput } from "./AudioNode";
-import { IMidiInput, IMidiOutput, MidiInput, MidiOutput } from "./MidiNode";
-import { ForwardInput, ForwardOutput, IForwardInput, IForwardOutput } from "./ForwardNode";
-type AnyInput = AudioInput | MidiInput | ForwardInput;
-type AnyOuput = AudioOutput | MidiOutput | ForwardOutput;
-type IAnyInput = IAudioInput | IMidiInput | IForwardInput;
-type IAnyOutput = IAudioOutput | IMidiOutput | IForwardOutput;
-type IAnyIO = IAnyInput | IAnyOutput | IForwardOutput;
-export { IOCollection, IOType, AudioInput, AudioOutput, MidiInput, MidiOutput, ForwardInput, ForwardOutput, };
-export type { IAnyIO, IIONode, IAudioInput, IAudioOutput, IMidiInput, IMidiOutput, IForwardInput, IForwardOutput, IAnyInput, IAnyOutput, IIOSerialize, AnyInput, AnyOuput, };

package/dist/build/core/Module/index.d.ts

@@ -1,6 +0,0 @@
-import Module, { Connectable } from "./MonoModule";
-import PolyModule from "./PolyModule";
-export { default, DummnyInternalModule } from "./MonoModule";
-export { default as PolyModule } from "./PolyModule";
-export type { ModuleInterface, Connectable, Triggerable, Startable, } from "./MonoModule";
-export type AudioModule = Module<Connectable, any> | PolyModule<Module<Connectable, any>, any>;

package/dist/build/core/midi/index.d.ts

@@ -1,5 +0,0 @@
-export { default as MidiEvent } from "./MidiEvent";
-export { default as MidiDevice } from "./MidiDevice";
-export { default as MidiDeviceManager } from "./MidiDeviceManager";
-export type { MidiDeviceInterface } from "./MidiDevice";
-export type { MidiEventType } from "./MidiEvent";

package/dist/build/index.d.ts

@@ -1,9 +0,0 @@
-export { default } from "./Engine";
-export { MidiDevice, MidiDeviceManager } from "./core/midi";
-export { default as Note } from "./core/Note";
-export type { MidiDeviceInterface } from "./core/midi";
-export type { INote } from "./core/Note";
-export type { ModuleInterface, AudioModule } from "./core/Module";
-export type { ISequence } from "./modules";
-export type { RouteInterface, RouteProps } from "./routes";
-export type { IIOSerialize as IOProps } from "./core/IO";

package/dist/build/modules/Envelope/index.d.ts

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

package/dist/build/modules/index.d.ts

@@ -1,17 +0,0 @@
-import { AudioModule } from "../core/Module";
-export { default as Master } from "./Master";
-export { default as Filter } from "./Filter";
-export { default as Oscillator } from "./Oscillator";
-export { default as VirtualMidi } from "./VirtualMidi";
-export { default as VoiceScheduler } from "./VoiceScheduler";
-export { default as Sequencer } from "./Sequencer";
-export type { ISequence } from "./Sequencer";
-export { Envelope, AmpEnvelope, FreqEnvelope, EnvelopeStages, } from "./Envelope";
-export interface ICreateModule {
-    id?: string;
-    name: string;
-    numberOfVoices?: number;
-    type: string;
-    props: any;
-}
-export declare function createModule(params: ICreateModule): AudioModule;