Merge 8b8aefe into d7e1f9b

source-academy · Sep 12, 2018 · 6439b16 · 6439b16
2 parents d7e1f9b + 8b8aefe
commit 6439b16
Show file tree

Hide file tree

Showing 5 changed files with 530 additions and 3 deletions.
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -17,6 +17,6 @@ fi
 
 yarn install --production=true
 tsc
-cd build && zip -r --exclude=*terraform* ../grader.zip index.js util.js graphics/ sound/ && cd ..
+cd build && zip -r --exclude=*terraform* ../grader.zip index.js util.js list.js graphics/ sound/ && cd ..
 zip -ur grader.zip node_modules/
 yarn install --production=false
diff --git a/src/__tests__/test_sounds.ts b/src/__tests__/test_sounds.ts
@@ -11,7 +11,9 @@ const makeAwsEvent = awsEventFactory({
       'get_duration',
       'get_wave',
       'is_sound',
+      'letter_name_to_midi_note',
       'make_sourcesound',
+      'midi_note_to_frequency',
       'noise',
       'play',
       'sawtooth_sound',

diff --git a/src/index.ts b/src/index.ts
@@ -63,6 +63,9 @@ type TimeoutResult = {
 }
 
 export const runAll = async (event: AwsEvent): Promise<Output[]> => {
+  if (event.library && event.library.chapter >= 2) {
+    require('./list.js')
+  }
   if (event.library && event.library.external) {
     switch(event.library.external.name) {
       case 'TWO_DIM_RUNES': {}