Skip to content

Commit bb62030

Browse files
jsakasjsakas
committed
Fix all the imports
1 parent b116088 commit bb62030

40 files changed

+159
-152
lines changed

‎.eslintignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
node_modules
2+
coverage
3+
build

‎core/Subtractor.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Observable } from './Observe';
2-
import { Osc } from './Osc';
3-
import { Filter } from './Filter';
4-
import { Envelope } from './Envelope';
1+
import Osc from './osc';
2+
import Filter from './filter';
3+
import Envelope from './envelope';
4+
import { Observable } from './observable';
55
import { knobToSeconds, knobToFreq } from './utils/maths';
66
import { renameObjectKey, intToWaveform, waveformToInt } from './utils/helpers';
77

‎core/Subtractor.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'web-audio-test-api';
2-
import Subtractor from '../src/Subtractor';
2+
import Subtractor from './Subtractor';
33

44

55
describe('Subtractor', () => {

‎core/envelope/Envelope.js

+3-72
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Observable } from './Observe';
2-
import { knobToAttack, knobToDecay, knobToRelease } from './utils/maths';
1+
import { Observable } from '../observable';
2+
import { knobToAttack, knobToDecay, knobToRelease } from '../utils/maths';
33

44
// some web audio api params fail if you try to modulate them to zero.
55
const NO_ZERO = 0.00001;
66

7-
class Envelope extends Observable {
7+
export default class Envelope extends Observable {
88
constructor(context, audioParam) {
99
super();
1010

@@ -129,72 +129,3 @@ class Envelope extends Observable {
129129
return this._maxValue;
130130
}
131131
}
132-
133-
class EnvelopeGraph {
134-
constructor(envelope, canvas) {
135-
this.envelope = envelope;
136-
this.canvas = canvas;
137-
138-
this.getRect();
139-
this.draw = this.draw.bind(this);
140-
this.draw();
141-
142-
window.addEventListener('resize', () => this.getRect());
143-
}
144-
145-
values () {
146-
let {
147-
attack,
148-
decay,
149-
sustain,
150-
release
151-
} = this.envelope();
152-
153-
return {
154-
a: Math.floor(knobToAttack(attack) * 100),
155-
d: Math.floor(knobToDecay(decay) * 100),
156-
s: 1 - (sustain / 127),
157-
r: Math.floor(knobToRelease(release) * 100),
158-
};
159-
}
160-
161-
draw() {
162-
requestAnimationFrame(this.draw);
163-
let w = this.width;
164-
let h = this.height;
165-
let { a, d, s, r } = this.values();
166-
a += 3;
167-
d += 10;
168-
r += 3;
169-
let t = a + d + r;
170-
171-
let ap = (a / t) * w;
172-
let dp = (d / t) * w;
173-
let rp = (r / t) * w;
174-
let sp = Math.floor(s * h);
175-
176-
let context = this.canvas.getContext('2d');
177-
context.imageSmoothingEnabled = true;
178-
179-
context.clearRect(0, 0, w, h);
180-
181-
context.strokeStyle = '#141414';
182-
context.beginPath();
183-
context.moveTo(0, h);
184-
context.lineTo(ap, 0);
185-
context.quadraticCurveTo(ap, sp, ap + dp, sp);
186-
context.quadraticCurveTo(ap + dp, h, ap + dp + rp, h);
187-
context.stroke();
188-
189-
}
190-
191-
getRect() {
192-
this.canvasRect = this.canvas.getBoundingClientRect();
193-
this.width = this.canvasRect.width;
194-
this.height = this.canvasRect.height;
195-
this.canvas.setAttribute('width', this.width);
196-
this.canvas.setAttribute('height', this.height);
197-
}
198-
}
199-
200-
export { Envelope, EnvelopeGraph };

‎core/envelope/Envelope.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'web-audio-test-api';
2-
import { Envelope } from '../src/Envelope';
2+
import Envelope from './Envelope';
33

44

55
describe('Envelope', () => {

‎core/envelope/EnvelopeGraph.js

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
2+
class EnvelopeGraph {
3+
constructor(envelope, canvas) {
4+
this.envelope = envelope;
5+
this.canvas = canvas;
6+
7+
this.getRect();
8+
this.draw = this.draw.bind(this);
9+
this.draw();
10+
11+
window.addEventListener('resize', () => this.getRect());
12+
}
13+
14+
values () {
15+
let {
16+
attack,
17+
decay,
18+
sustain,
19+
release
20+
} = this.envelope();
21+
22+
return {
23+
a: Math.floor(knobToAttack(attack) * 100),
24+
d: Math.floor(knobToDecay(decay) * 100),
25+
s: 1 - (sustain / 127),
26+
r: Math.floor(knobToRelease(release) * 100),
27+
};
28+
}
29+
30+
draw() {
31+
requestAnimationFrame(this.draw);
32+
let w = this.width;
33+
let h = this.height;
34+
let { a, d, s, r } = this.values();
35+
a += 3;
36+
d += 10;
37+
r += 3;
38+
let t = a + d + r;
39+
40+
let ap = (a / t) * w;
41+
let dp = (d / t) * w;
42+
let rp = (r / t) * w;
43+
let sp = Math.floor(s * h);
44+
45+
let context = this.canvas.getContext('2d');
46+
context.imageSmoothingEnabled = true;
47+
48+
context.clearRect(0, 0, w, h);
49+
50+
context.strokeStyle = '#141414';
51+
context.beginPath();
52+
context.moveTo(0, h);
53+
context.lineTo(ap, 0);
54+
context.quadraticCurveTo(ap, sp, ap + dp, sp);
55+
context.quadraticCurveTo(ap + dp, h, ap + dp + rp, h);
56+
context.stroke();
57+
58+
}
59+
60+
getRect() {
61+
this.canvasRect = this.canvas.getBoundingClientRect();
62+
this.width = this.canvasRect.width;
63+
this.height = this.canvasRect.height;
64+
this.canvas.setAttribute('width', this.width);
65+
this.canvas.setAttribute('height', this.height);
66+
}
67+
}
68+
69+
export default EnvelopeGraph;

‎core/envelope/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('./Envelope');

‎core/filter/Filter.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { intToFilter, filterToInt } from './utils/helpers';
2-
import { knobToFreq, freqToKnob } from './utils/maths';
3-
import { Observable } from './Observe';
1+
import { intToFilter, filterToInt } from '../utils/helpers';
2+
import { knobToFreq, freqToKnob } from '../utils/maths';
3+
import { Observable } from '../observable';
44

5-
class Filter extends Observable {
5+
export default class Filter extends Observable {
66
constructor(context) {
77
super();
88
this.context = context;
@@ -55,5 +55,3 @@ class Filter extends Observable {
5555
return this._filter.gain.value;
5656
}
5757
}
58-
59-
export { Filter };

‎core/filter/Filter.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'web-audio-test-api';
2-
import { Filter } from '../src/Filter';
2+
import Filter from './Filter';
33

44
test('Filter default type is lowpass', () => {
55
const context = new AudioContext();

‎core/filter/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('./Filter');

‎core/midi/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('./Midi');

‎core/observable/Observable.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class Observable {
1+
export class Observable {
22
constructor() {
33
this.observers = [];
44
}
@@ -14,7 +14,7 @@ class Observable {
1414
}
1515
}
1616

17-
class Observer {
17+
export class Observer {
1818
constructor(observable) {
1919
observable.registerObserver(this);
2020
}
@@ -23,5 +23,3 @@ class Observer {
2323
console.log('Got update from', observable);
2424
}
2525
}
26-
27-
export { Observable, Observer };

‎core/observable/Observable.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Observer, Observable } from '../src/Observe';
1+
import { Observer, Observable } from '../Observable';
22

33
describe('Observable', () => {
44
test('notifies Observers of a property change', () => {

‎core/observable/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('./Observable');

‎core/osc/Osc.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { shiftNote, getNoteFreq, getDetuneSpread } from './utils/maths';
2-
import { intToWaveform, waveformToInt } from './utils/helpers';
3-
import { Observable } from './Observe';
1+
import { shiftNote, getNoteFreq, getDetuneSpread } from '../utils/maths';
2+
import { intToWaveform, waveformToInt } from '../utils/helpers';
3+
import { Observable } from '../observable';
44

55
const knobToStereo = (v = 0) => v / 5000;
66
const stereoToKnob = (v = 0) => v * 5000;
77

8-
class Osc extends Observable {
8+
export default class Osc extends Observable {
99
constructor(audioContext, {
1010
enabled = 0,
1111
waveform = 0,
@@ -160,5 +160,3 @@ class Osc extends Observable {
160160
return this._oscs;
161161
}
162162
}
163-
164-
export { Osc };

‎core/osc/Osc.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'web-audio-test-api';
2-
import * as maths from '../src/utils/maths';
3-
import { Osc } from '../src/Osc';
2+
import * as maths from '../utils/maths';
3+
import Osc from './Osc';
44

55

66
describe('Osc', () => {

‎core/osc/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('./Osc');

‎core/preset/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('./PresetFileController');

‎core/querty/QwertyController.js renamed to ‎core/qwerty/QwertyController.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { keyboardKeys } from '../utils/keyboard';
22

3-
const initQuertyController = (subtractor) => {
3+
const initQwertyController = (subtractor) => {
44
let keyWasPressed = [];
55
let noteWasPressed = [];
66

@@ -40,4 +40,4 @@ const initQuertyController = (subtractor) => {
4040
});
4141
};
4242

43-
export default initQuertyController;
43+
export default initQwertyController;

‎core/qwerty/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('./QwertyController');

‎core/utils/helpers.js

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
const whole = n => Number(Number(n).toFixed());
1+
export const whole = n => Number(Number(n).toFixed());
22

3-
const intToWaveform = function(i) {
3+
export const intToWaveform = function(i) {
44
return ['sine', 'square', 'sawtooth', 'triangle'][whole(i) - 1] || 'sine';
55
};
66

7-
const waveformToInt = function(w) {
7+
export const waveformToInt = function(w) {
88
return ['sine', 'square', 'sawtooth', 'triangle'].indexOf(w) + 1;
99
};
1010

11-
const intToFilter = function(i) {
11+
export const intToFilter = function(i) {
1212
return [
1313
'lowpass',
1414
'highpass',
@@ -21,7 +21,7 @@ const intToFilter = function(i) {
2121
][whole(i).toFixed() - 1] || 'lowpass';
2222
};
2323

24-
const filterToInt = function(f) {
24+
export const filterToInt = function(f) {
2525
return [
2626
'lowpass',
2727
'highpass',
@@ -34,10 +34,8 @@ const filterToInt = function(f) {
3434
].indexOf(f) + 1;
3535
};
3636

37-
const renameObjectKey = (obj, oldKey, newKey) => {
37+
export const renameObjectKey = (obj, oldKey, newKey) => {
3838
obj[newKey] = obj[oldKey];
3939
delete obj[oldKey];
4040
return obj;
4141
};
42-
43-
export { intToWaveform, waveformToInt, intToFilter, filterToInt, renameObjectKey };

‎core/utils/helpers.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { renameObjectKey } from '../../src/utils/helpers';
1+
import { renameObjectKey } from './helpers';
22

33
describe('renameObjectKey', () => {
44
test('renames an object key', () => {

‎core/utils/maths.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
pointToPercent,
55
getDetuneSpread,
66
shiftNote
7-
} from '../../src/utils/maths';
7+
} from './maths';
88

99
describe('shiftNote', () => {
1010
test('shifts notes by octave and semi', () => {

0 commit comments

Comments
 (0)