cleanup, project/directory management

.gitignore

@@ -1,2 +1 @@
-/node_modules
+/node_modules
-/built

package.json

@@ -12,12 +12,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "tone": "^14.7.77",
+    "tone": "^14.7.77"
-    "typescript": "^4.6.4"
-  },
-  "devDependencies": {
-    "@types/node": "^17.0.32",
-    "tone": "^14.7.77",
-    "typescript": "^4.6.4"
   }
 }

src/audioUtil.js

@@ -1,7 +1,7 @@
 import { soundChord } from "../app.js";
+import { extractPitchset } from "./dataConversions.js";
 import { getRandomPitches } from "./pitch_generation/getRandomPitches.js";
 import { getProceduralPitches } from "./pitch_generation/getProceduralPitches.js";
-import { extractPitchset } from "./data_conversions/extractPitchset.js";
 
 // initial test: generate a single, random chord
 export const fullRandomChord = () => {

src/dataConversions.js

@@ -1,5 +1,9 @@
-import { musicalPitches } from '../harmonyUtil.js';
+import { musicalPitches } from './harmonyUtil.js';
-import { extractPitchName } from './extractPitchName.js';
+
+// inline functions for converting between data types
+export const extractPitchName = (tonePitchName) => tonePitchName.match(/[A-Gb#]/g).join('');
+export const extractOctave = (pitchName) => pitchName.match(/[0-9]/g).join('');
+export const getRandomIndex = (voice) => Math.floor(Math.random() * 100) % voice.length;
 
 // converts pitches in Tone.js string format to base-12 number pitchsets
 export const extractPitchset = (pitches) => {
@@ -19,4 +23,4 @@ export const extractPitchset = (pitches) => {
     // these are sorted from lowest to highest index (something like an interval vector)
     pitchset.sort((a,b) => a < b);
     return pitchset;
-}
+}

src/data_conversions/extractOctave.js

@@ -1 +0,0 @@
-export const extractOctave = (pitchName) => pitchName.match(/[0-9]/g).join('');

src/data_conversions/extractPitchName.js

@@ -1 +0,0 @@
-export const extractPitchName = (tonePitchName) => tonePitchName.match(/[A-Gb#]/g).join('');

src/pitch_generation/getProceduralPitches.js

@@ -1,6 +1,5 @@
 import { pitchsets, musicalPitches } from "../harmonyUtil.js";
-import { extractPitchName } from "../data_conversions/extractPitchName.js";
+import { extractPitchName, getRandomIndex } from "../dataConversions.js";
-import { getRandomIndex } from "./getRandomPitches.js";
 import { melodicGeneration } from './melodicGeneration.js';
 import { sonorityList } from "./sonorityList.js";
 

src/pitch_generation/getRandomPitches.js

@@ -1,8 +1,5 @@
 import { pitchsets } from "../harmonyUtil.js";
-import { extractPitchName } from "../data_conversions/extractPitchName.js";
+import { extractPitchName, getRandomIndex } from "../dataConversions.js";
-
-// helper function for assigning a random index for a given voice's pitchset
-export const getRandomIndex = (voice) => Math.floor(Math.random() * 100) % voice.length;
 
 export const getRandomPitches = () => {
     // pitches stored in Tone.js string format

src/pitch_generation/helper.js

@@ -1,11 +0,0 @@
-import { melodicGeneration } from "./melodicGeneration.js";
-
-// let result = melodicGeneration(['C3', 'G3', 'A3', 'G5']);
-// console.log(result);
-
-let myArray = [[1,2], [3,4], [5,6]];
-
-let shifted = myArray.shift();
-
-console.log(shifted);
-console.log(myArray);

src/pitch_generation/melodicGeneration.js

@@ -1,6 +1,5 @@
 import { getRandomPitches } from './getRandomPitches.js';
-import { extractPitchName } from '../data_conversions/extractPitchName.js';
+import { extractOctave, extractPitchName } from '../dataConversions.js';
-import { extractOctave } from '../data_conversions/extractOctave.js';
 import { musicalPitches, pitchsets } from '../harmonyUtil.js';
 
 // reads the pitch of the previous sonority and determines appropriate melodic movement for the soprano

src/vector_logic/evaluateVector.js

@@ -1,5 +1,5 @@
 import { getRandomPitches } from '../pitch_generation/getRandomPitches.js';
-import { extractPitchset } from "../data_conversions/extractPitchset.js";
+import { extractPitchset } from "../dataConversions.js";
 import { findVector } from "./findVector.js";
 
 export const evaluateVector = (vector) => {