1 files changed, 24 insertions, 9 deletions
diff --git a/js/bird-words/beak.js b/js/bird-words/beak.js
index 7335a98..9968d5f 100644
--- a/js/bird-words/beak.js
+++ b/js/bird-words/beak.js
@@ -16,10 +16,10 @@ const prettyItUp = string => {
     return string.charAt(0).toUpperCase() + string.slice(1) + "!";
 }
 
-let corpus = fs.readFileSync('corpus.txt', 'utf8');
+let corpus = fs.readFileSync('lib/corpus.txt', 'utf8');
 let words = corpus.toLowerCase().replace(/[.,\/#!$%\^&\*;:{}=\-_`~()]/g,"").replace(/\n/g, " ").replace(/\s{2,}/g, " ").split(" ");
 
-let markovChain = new Map();
+let markovChain = new Map(); // CONSIDER: is there a way to persist this data structure so we don't have to rebuild it every time? What does that change?
 
 for (let i = 0; i < words.length - 2; i++) {
     let pair = words[i] + ' ' + words[i + 1];
@@ -43,11 +43,15 @@ for (let i = 0; i < storyLength; i++) {
     story += " " + randomPair.split(' ')[1];
 }
 
-let nouns = fs.readFileSync('nouns.txt', 'utf8').split('\n');
-let adjectives = fs.readFileSync('adjectives.txt', 'utf8').split('\n');
-let places = fs.readFileSync('places.txt', 'utf8').split('\n');
+// CONSIDER: this *could* be generalized to be more clever, maybe pull in an arbitrary filename based on the template tag passed...but that feels sloppy and unsafe, so keeping with the naive approach for now
+let places = fs.readFileSync('lib/places.txt', 'utf8').split('\n');
+let colors = fs.readFileSync('lib/colors.txt', 'utf8').split('\n');
+let nouns = fs.readFileSync('lib/nouns.txt', 'utf8').split('\n');
+let verbs = fs.readFileSync('lib/verbs.txt', 'utf8').split('\n');
+let adjectives = fs.readFileSync('lib/adjectives.txt', 'utf8').split('\n');
+let adverbs = fs.readFileSync('lib/adverbs.txt', 'utf8').split('\n');
 
-const fillGaps = (script, nouns, adjectives, places, markovChain, pairs) => {
+const fillGaps = (script, nouns, verbs, adverbs, adjectives, places, colors, markovChain, pairs) => {
     return script.split('@').map(part => {
         if (part.startsWith('NOUN')) {
             return nouns[Math.floor(Math.random() * nouns.length)] + ' ';
@@ -55,12 +59,23 @@ const fillGaps = (script, nouns, adjectives, places, markovChain, pairs) => {
             return adjectives[Math.floor(Math.random() * adjectives.length)]  + ' ';
         } else if (part.startsWith('PLACE')) {
             return places[Math.floor(Math.random() * places.length)];
+        } else if (part.startsWith('VERB')) {
+            return verbs[Math.floor(Math.random() * verbs.length)];
+        } else if (part.startsWith('ADVERB')) {
+            return adverbs[Math.floor(Math.random() * adverbs.length)];
+        } else if (part.startsWith('COLOR')) {
+            return colors[Math.floor(Math.random() * colors.length)];
         } else if (part.startsWith('MARKOV')) {
             const length = parseInt(part.split(' ')[1]);
+            const words = part.split(' ').slice(2);
             let chain = '';
-            let pair = pairs[Math.floor(Math.random() * pairs.length)];
+            let pair = words.join(' ');
             for (let j = 0; j < length; j++) {
-                const nextWords = markovChain.get(pair);
+                let nextWords = markovChain.get(pair);
+                if (!nextWords) {
+                    pair = pairs[Math.floor(Math.random() * pairs.length)];
+                    nextWords = markovChain.get(pair);
+                }
                 const nextWord = nextWords[Math.floor(Math.random() * nextWords.length)];
                 chain += ' ' + nextWord;
                 pair = pair.split(' ')[1] + ' ' + nextWord;
@@ -78,5 +93,5 @@ if (!scriptFile) {
     console.log(wrap(prettyItUp(story), 40));
 } else {
     const script = fs.readFileSync(scriptFile, 'utf8');
-    console.log(wrap(prettyItUp(fillGaps(script, nouns, adjectives, places, markovChain, pairs)), 40));
+    console.log(wrap(prettyItUp(fillGaps(script, nouns, verbs, adverbs, adjectives, places, colors, markovChain, pairs)), 40));
 }
\ No newline at end of file