shiritori: switch interact to promise

Change-Id: Id75656c2053edda5a3d209ad3fa238d6fab6bdb3

Author: proppy

functions/shiritori/index.js

@@ -98,29 +98,29 @@ exports.kanas = (word) => new Set((() => {
 })())
 
 // しりとりのゲームループ。
-exports.interact = (dict, word, previousInputs, callbacks) => {
-  const next = exports.kanas(word)
-  if ((next.size === 0) || !exports.check(word, previousInputs)) {
-    return callbacks.lose()
+exports.interact = (dict, word, chain) => new Promise((resolve, reject) => {
+  const next = exports.kanas(word);
+  if ((next.size === 0) || !exports.check(word, chain)) {
+    return reject({loose: true})
   }
   const key = next.values().next().value
   dict(key).then((words) => {
     const unused = []
     if (words) {
       for (const k of Object.keys(words)) {
-        if (!previousInputs.includes(words[k])) {
+        if (!chain.includes(words[k])) {
           unused.push(k)
         }
       }
     }
     if (unused.length === 0) {
-      return callbacks.win()
+      return reject({win: true})
     }
     const w = unused[Math.floor(Math.random() * unused.length)]
     const wk = words[w]
     if (wk[wk.length - 1] === 'ん') {
-      return callbacks.win(w, wk)
+      return reject({win: true, 'word': w, 'kana': wk})
     }
-    return callbacks.next(w, wk)
+    return resolve({'word': w, 'kana': wk})
   })
-}
+})

functions/shiritori/main.js

@@ -27,30 +27,30 @@ const rl = readline.createInterface({
   output: process.stdout
 })
 
-const previousInputs = ['しりとり']
-console.log(previousInputs[0])
+const chain = ['しりとり']
+console.log(chain[0])
 rl.prompt()
 shiritori.loaded.then(() => {
-  rl.on('line', (input) => {
-    shiritori.interact(kana => Promise.resolve(
-        corpus[kana]), input, previousInputs, {
-          win (word, kana) {
-            if (word) {
-              console.log(`${word} [${kana}]`)
-            } else {
-              console.log('すごい！')
-            }
+  rl.on('line', input => {
+    shiritori
+        .interact(
+            kana => Promise.resolve(corpus[kana]),
+            input,
+            chain,
+        )
+        .then(result => {
+          console.log(`${result.word} [${result.kana}]`)
+          chain.unshift(input)
+          chain.unshift(result.word)
+          rl.prompt()
+        })
+        .catch(reason => {
+          if (reason.win) {
+            console.log('すごい！')
             process.exit(0)
-          },
-          lose () {
+          } else {
             console.log('ざんねん。')
             process.exit(-1)
-          },
-          next (word, kana) {
-            previousInputs.unshift(input)
-            previousInputs.unshift(kana)
-            console.log(`${word} [${kana}]`)
-            rl.prompt()
           }
         })
   })

functions/shiritori/test.js

@@ -79,57 +79,33 @@ const dict = k => Promise.resolve({
   }
 }[k])
 
-test.cb('internal.next', t => {
-  t.plan(2)
-  shiritori.interact(dict, 'べんと', [], {
-    next (word, kana) {
-      t.is('とんかつ', kana)
-      t.is('とんかつ', word)
-      t.end()
-    }
-  })
+test('internal.next', async t => {
+  const result = await shiritori.interact(dict, 'べんと', [],)
+  t.is('とんかつ', result.kana)
+  t.is('とんかつ', result.word)
 })
 
-test.cb('interact.lose', t => {
-  t.plan(1)
-  shiritori.interact(dict, 'つと', ['とつ', 'つと'], {
-    lose (result) {
-      t.is(undefined, result)
-      t.end()
-    }
-  })
+test('interact.lose', async t => {
+  const result = await t.throws(shiritori.interact(dict, 'つと', ['とつ', 'つと']))
+  t.is(true, result.loose)
 })
 
-test.cb('internal.win without result', t => {
-  t.plan(1)
-  shiritori.interact(dict, 'つと', ['とんかつ', 'べんと'], {
-    win (result) {
-      t.is(undefined, result)
-      t.end()
-    }
-  })
+test('internal.win without result', async t => {
+  const result = await t.throws(shiritori.interact(dict, 'つと', ['とんかつ', 'べんと']))
+  t.is(true, result.win)
 })
 
-test.cb('internal.win with result', t => {
-  t.plan(2)
-  shiritori.interact(dict, 'とんかつ', ['べんと'], {
-    win (word, kana) {
-      t.is('つけまん', kana)
-      t.is('つけまん', word)
-      t.end()
-    }
-  })
+test('internal.win with result', async t => {
+  const result = await t.throws(shiritori.interact(dict, 'とんかつ', ['べんと']))
+  t.is(true, result.win)
+  t.is('つけまん', result.kana)
+  t.is('つけまん', result.word)
 })
 
-test.cb('interact.win kanji', t => {
-  t.plan(2)
-  shiritori.loaded.then(() => {
-    shiritori.interact(dict, '銀座', ['鰻'], {
-      win (word, kana) {
-        t.is('ざぶとん', kana)
-        t.is('座布団', word)
-        t.end()
-      }
-    })
-  })
+test('interact.win kanji', async t => {
+  await shiritori.loaded
+  const result = await t.throws(shiritori.interact(dict, '銀座', ['鰻']))
+  t.is(true, result.win)
+  t.is('ざぶとん', result.kana)
+  t.is('座布団', result.word)
 })