@slugbugblue/trax 0.11.0 → 0.13.0

package/src/cli.js

@@ -21,9 +21,9 @@ import repl from 'node:repl'
 
 import YAML from 'yaml'
 
-import { Trax } from './engine.js'
-import { version } from './version.js'
-import * as tty from './tty.js'
+import { Trax } from '@slugbugblue/trax'
+import { version } from '@slugbugblue/trax/version'
+import * as tty from '@slugbugblue/trax/tty'
 
 // Load all the commands as individual plugins
 import { analyzeCmd } from './cmds/analyze.js'
@@ -40,6 +40,7 @@ import { listCmd } from './cmds/list.js'
 import { newCmd } from './cmds/new.js'
 import { playCmd, tryCmd } from './cmds/play-try.js'
 import { selectCmd } from './cmds/select.js'
+import { suggestCmd } from './cmds/suggest.js'
 import { undoCmd } from './cmds/undo.js'
 import { viewCmd } from './cmds/view.js'
 
@@ -88,6 +89,7 @@ const plugins = [
   playCmd,
   quitCmd,
   selectCmd,
+  suggestCmd,
   tryCmd,
   undoCmd,
   versionCmd,
@@ -111,7 +113,10 @@ const newId = (DATA) => {
   return String(min - 1)
 }
 
-// Colorize text according to simplistic and not very complete patterns
+/** Colorize text according to simplistic and not very complete patterns.
+ * @type Colorer
+ */
+// @ts-ignore
 const color = (text, def) => {
   let out = ''
   let quote = false
@@ -121,7 +126,7 @@ const color = (text, def) => {
   const short = (t) => tty.color(t, CLI.COLORS.short) + c()
   for (const char of text) {
     switch (char) {
-      case '"':
+      case '"': {
         if (quote) {
           colors.pop()
         } else {
@@ -131,31 +136,45 @@ const color = (text, def) => {
         out += c('')
         quote = !quote
         break
-      case '#':
+      }
+
+      case '#': {
         id = true
         colors.push(CLI.COLORS.id)
         out += c('#')
         break
-      case '|':
+      }
+
+      case '|': {
         out += short('|')
         break
-      case '[':
+      }
+
+      case '[': {
         colors.push(CLI.COLORS.optional)
         out += short('[')
         break
-      case ']':
+      }
+
+      case ']': {
         colors.pop()
         out += short(']')
         break
-      case '<':
+      }
+
+      case '<': {
         colors.push(CLI.COLORS.variable)
         out += c('')
         break
-      case '>':
+      }
+
+      case '>': {
         colors.pop()
         out += c('')
         break
-      default:
+      }
+
+      default: {
         if (id && !/[\da-z]/.test(char)) {
           id = false
           colors.pop()
@@ -163,6 +182,7 @@ const color = (text, def) => {
         } else {
           out += char
         }
+      }
     }
   }
 
@@ -170,7 +190,7 @@ const color = (text, def) => {
 }
 
 // Internal representations of files
-const CONFIG = { id: 0 }
+const CONFIG = { id: '' }
 const DATA = { games: {} }
 
 // CLI context object for plugins
@@ -550,11 +570,34 @@ const completer = (line) => {
   return [completions, match]
 }
 
+const ambiguousSuggestions = (cmd) => {
+  const maybe = new Set()
+  for (const alias of cmd) {
+    if (alias.startsWith(CLI.CMD)) maybe.add(alias)
+
+    let alts = commands[alias].alt
+    alts = is(alts, 'arr') ? alts : [alts || '']
+
+    for (const alt of alts) {
+      if (alt.startsWith(CLI.CMD)) maybe.add(alt)
+    }
+  }
+
+  return maybe
+}
+
 const evaluate = async (command) => {
   const [CMD, ...words] = command.split(/\s+/).filter(Boolean)
-  const cmdLower = CMD.toLowerCase()
+  const cmdLower = CMD?.toLowerCase() || ''
   CLI.CMD = cmdLower
-  const cmd = abbreviations[cmdLower]
+  let cmd = abbreviations[cmdLower]
+
+  // If we are not in a REPL, let's remove hidden commands
+  if (!CLI.repl && is(cmd, 'arr')) {
+    cmd = cmd.filter((c) => !commands[c].hide)
+    if (cmd.length === 1) cmd = cmd[0]
+  }
+
   if (is(cmd, 'str')) {
     if (words.length > 0 && abbreviations[words[0].toLowerCase()] === 'help') {
       commands.help.fn(CLI, cmd)
@@ -563,18 +606,7 @@ const evaluate = async (command) => {
     }
   } else if (is(cmd, 'arr')) {
     CLI.error('Ambiguous command. Perhaps you meant one of the following:')
-    const maybe = new Set()
-
-    for (const alias of cmd) {
-      if (alias.startsWith(cmdLower)) maybe.add(alias)
-
-      let alts = commands[alias].alt
-      alts = is(alts, 'arr') ? alts : [alts || '']
-
-      for (const alt of alts) {
-        if (alt.startsWith(cmdLower)) maybe.add(alt)
-      }
-    }
+    const maybe = ambiguousSuggestions(cmd)
 
     if (maybe.size > 0) {
       for (const alias of [...maybe].sort()) {
@@ -593,8 +625,6 @@ const evaluate = async (command) => {
       CLI.error('Unknown command. Type "help" for a list of valid commands.')
     }
   }
-
-  return undefined
 }
 
 const main = async () => {
@@ -630,4 +660,4 @@ const main = async () => {
   }
 }
 
-main()
+await main()

package/src/cmds/analyze.js

@@ -15,8 +15,8 @@
 
 // CLI analyze command
 
-import { analyze } from '../analyst.js'
-import { Trax } from '../engine.js'
+import { analyze } from '@slugbugblue/trax/analyst'
+import { Trax } from '@slugbugblue/trax'
 
 const notationRx = /^[@a-z]+\d+[bps/\\+]$/i
 
@@ -40,7 +40,7 @@ const threatNames = {
 const listThreats = (threats, detailed) => {
   const summary = []
   for (const level of Object.keys(threats || {})) {
-    const name = (threatNames[level] || `stage-${level} threats`) + ': '
+    const name = (threatNames[level] || `${level}-stage threats`) + ': '
     const items = []
     if (detailed) {
       for (const item of threats[level]) {

package/src/cmds/import-export.js

@@ -21,7 +21,7 @@ import process from 'node:process'
 import envPaths from 'env-paths'
 import makeDir from 'make-dir'
 
-import { Trax } from '../engine.js'
+import { Trax } from '@slugbugblue/trax'
 
 const paths = envPaths('trax', { suffix: '' })
 const PATHS = {}

package/src/cmds/list.js

@@ -15,7 +15,7 @@
 
 // CLI list command
 
-import { Trax } from '../engine.js'
+import { Trax } from '@slugbugblue/trax'
 
 export const listCmd = {
   name: 'list',
@@ -41,7 +41,7 @@ export const listCmd = {
 }
 
 const plural = (n, noun, nouns) =>
-  n + ' ' + (Math.abs(n) === 1 ? noun : nouns ? nouns : noun + 's')
+  n + ' ' + (Math.abs(n) === 1 ? noun : nouns || noun + 's')
 
 const alphaSort = (a, b) => {
   a = String(a).toLowerCase()

package/src/cmds/new.js

@@ -58,13 +58,13 @@ const pairs = [
   ['Mario', 'Luigi'],
   ['Marlin', 'Dory'],
   ['Mary-Kate', 'Ashley'],
-  ['Micky', 'Minnie'],
+  ['Mickey', 'Minnie'],
   ['Miss Piggy', 'Kermit'],
   ['Mork', 'Mindy'],
   ['Obi-Wan', 'Anakin'],
   ['Pan', 'Hook'],
   ['Phineas', 'Ferb'],
-  ['Player 1', 'Player 2'],
+  ['player 1', 'player 2'],
   ['p1', 'p2'],
   ['R2-D2', 'C-3PO'],
   ['Ren', 'Stimpy'],
@@ -89,7 +89,9 @@ const pairs = [
 ]
 
 const pairUp = () => {
-  return pairs[Math.floor(Math.random() * pairs.length)]
+  const duo = pairs[Math.floor(Math.random() * pairs.length)]
+  if (duo[0].toLowerCase() !== duo[0] && Math.random() < 0.5) duo.reverse()
+  return duo
 }
 
 newCmd.fn = (CLI, variant, ...names) => {

package/src/cmds/suggest.js

@@ -0,0 +1,52 @@
+/* Copyright 2022 Chad Transtrum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLI suggest command
+
+import { suggest } from '@slugbugblue/trax/analyst'
+
+export const suggestCmd = {
+  name: 'suggest',
+  alt: ['bot'],
+  desc: 'suggest a move',
+  help: ['Suggest a move in the current game.'],
+}
+
+suggestCmd.fn = (CLI, debug) => {
+  if (!String(CLI.GAME?.id)) {
+    return CLI.error('No active game. Type "new" to start a game.')
+  }
+
+  const game = CLI.TRAX
+  const suggestion = suggest(game)
+
+  if (!suggestion.best) return
+
+  CLI.out(
+    CLI.bubble(
+      game.turn === '1' ? 'wh' : 'bh',
+      String(game.move + 1) + '. ' + suggestion.pick.move,
+    ),
+  )
+
+  if ('debug'.startsWith(debug)) {
+    const m = []
+    for (const move of suggestion.options) {
+      m.push(move.move + ' ' + move.score)
+    }
+
+    CLI.out('[' + m.join(', ') + '] ' + suggestion.ms + 'ms')
+  }
+}