@slugbugblue/trax 0.2.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slugbugblue/trax",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "description": "Trax game engine and friends",
   "keywords": [
     "trax",
@@ -14,18 +14,29 @@
   "exports": "./engine.js",
   "repository": "gitlab:slugbugblue/trax",
   "scripts": {
-    "test": "tape tests.js",
+    "test": "xo && c8 ava",
     "preversion": "npm test",
     "postversion": "git push && git push --tags"
   },
   "devDependencies": {
-    "eslint": "8.x",
-    "tape": "5.x",
-    "typescript": "^4.5.4",
-    "typescript-language-server": "^0.8.1"
+    "ava": "^4.0.1",
+    "c8": "^7.11.0",
+    "prettier": "^2.5.1",
+    "xo": "^0.47.0"
   },
   "type": "module",
   "engines": {
     "node": "^14.14.0 || >=16.0.0"
+  },
+  "prettier": {
+    "bracketSpacing": true,
+    "proseWrap": "always",
+    "semi": false,
+    "singleQuote": true,
+    "trailingComma": "all",
+    "useTabs": false
+  },
+  "xo": {
+    "prettier": true
   }
 }

package/tty.js

@@ -1,4 +1,4 @@
-/* Copyright 2021 Chad Transtrum
+/* Copyright 2021-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.
@@ -15,13 +15,15 @@
 
 // Ever wanted to draw Trax boards on the console? I have.
 
+import process from 'node:process'
+
 import Trax from './engine.js'
 
-const esc = '\x1b['  // start of console color escape code
-const off = esc + 'm'  // color reset code
+const esc = '\u001B[' // Start of console color escape code
+const off = esc + 'm' // Color reset code
 
 // display a message with optional color
-const out = (message, fgcolor, bgcolor) => {
+export const outty = (message, fgcolor, bgcolor) => {
   let ansi = fgcolor || bgcolor ? esc : ''
   if (fgcolor) ansi += '38;5;' + fgcolor
   if (bgcolor) ansi += '48;5;' + bgcolor
@@ -29,148 +31,203 @@ const out = (message, fgcolor, bgcolor) => {
   console.log(ansi + message + off)
 }
 
-let set = 'trax' // which color set should we draw with?
+let set = 'trax' // Which color set should we draw with?
 
 // a little magic to display the game in progress
-const color_sets = {  // Colors for terminal sequence: <Esc>[38;5;<color_num>m
+const colorSets = {
+  // Colors for terminal sequence: <Esc>[38;5;<color_num>m
   // b, B, w, W: color of line for each player, capital for a winning line
   // e: empty (ie, board) color, t: tile color
   trax: { b: 238, B: 57, e: 19, t: 74, w: 255, W: 184 },
   trax8: { b: 236, B: 21, e: 58, t: 137, w: 254, W: 117 },
   traxloop: { b: 235, B: 20, e: 17, t: 61, w: 253, W: 222 },
+  tentative: { b: 235, B: 18, e: 19, t: 244, w: 252, W: 217 },
 }
 
-const ln = 'm\u2584'  // lower half block -- with the leading m to terminate ansi color escape
-const up = 'm\u2588'  // full block
-const lt = 'm\u2599'  // lower half and left half block
-const rt = 'm\u259f'  // lower half and right half block
-const fg = n => '38;5;' + String(set[n])  // foreground color_num
-const bg = n => '48;5;' + String(set[n])  // background color_num
-const sp = () => esc + bg('e') + 'm '  // lower space
+const ln = 'm\u2584' // Lower half block -- with the leading m to terminate ansi color escape
+const up = 'm\u2588' // Full block
+const lt = 'm\u2599' // Lower half and left half block
+const rt = 'm\u259F' // Lower half and right half block
+const fg = (n) => '38;5;' + String(set[n]) // Foreground color_num
+const bg = (n) => '48;5;' + String(set[n]) // Background color_num
+const sp = () => esc + bg('e') + 'm ' // Lower space
 // tiles are displayed on two lines; the top half of the first line is empty
 // and the second half is composed of three characters, up color surrounded by tile color
-const uptty = clr => esc + fg('t') + ';' + bg('e') + ln
-  + esc + fg(clr) + ln + esc + fg('t') + ln + ' '
-// the top half of the second line has both horizontal lines with a center transition
+const uptty = (clr) =>
+  esc +
+  fg('t') +
+  ';' +
+  bg('e') +
+  ln +
+  esc +
+  fg(clr) +
+  ln +
+  esc +
+  fg('t') +
+  ln +
+  ' '
+// The top half of the second line has both horizontal lines with a center transition
 // while the bottom half is the tile background color surrounding the down color
-const horiztty = clr => esc + fg('t') + ';' + bg(clr) + ln
-const dntty = (clr, oppclr, char) => esc + fg(clr) + (char === up ? '' : ';' + bg(oppclr)) + char
-// list of icon_char => tile line colors for easy reference in order up, right, down, left
-const tiles = { a: 'bbww', b: 'bwbw', c: 'bwwb', d: 'wbbw', e: 'wbwb', f: 'wwbb' }
+const horiztty = (clr) => esc + fg('t') + ';' + bg(clr) + ln
+const dntty = (clr, oppclr, char) =>
+  esc + fg(clr) + (char === up ? '' : ';' + bg(oppclr)) + char
+// List of icon_char => tile line colors for easy reference in order up, right, down, left
+const tiles = {
+  a: 'bbww',
+  b: 'bwbw',
+  c: 'bwwb',
+  d: 'wbbw',
+  e: 'wbwb',
+  f: 'wwbb',
+}
 
-// return the ANSI codes to display a 3x1.5 block tile, one line at a time
-const tile_tty = (tile, top) => { // top: true for first line, false for second
+// Return the ANSI codes to display a 3x1.5 block tile, one line at a time
+const tileTty = (tile, top) => {
+  // Top: true for first line, false for second
   // quick access to tile color and its opposite in upper case
-  let colors = { b: 'b', w: 'w', B: 'w', W: 'b' }
-  if (!(tile in tiles)) { // winning paths are represented by adding 6 to the tile char code
-    tile = String.fromCharCode(tile.charCodeAt(0) - 6)
+  const colors = { b: 'b', w: 'w', B: 'w', W: 'b' }
+  const save = set
+  const tentative = tile !== tile.toLowerCase()
+  if (tentative) set = colorSets.tentative
+  tile = tile.toLowerCase()
+  if (!(tile in tiles)) {
+    // Winning paths are represented by adding 6 to the tile char code
+    tile = String.fromCodePoint(tile.codePointAt(0) - 6)
     if (tile in tiles) {
       colors.w = 'W'
       colors.B = 'W'
-    } else {  // and another six for a black win
-      tile = String.fromCharCode(tile.charCodeAt(0) - 6)
+    } else {
+      // And another six for a black win
+      tile = String.fromCodePoint(tile.codePointAt(0) - 6)
       colors.b = 'B'
       colors.W = 'B'
     }
   }
+
+  let value = false
   if (tile in tiles) {
     tile = tiles[tile]
-    if (top) return uptty(colors[tile[0]])
-    let center_char = tile[1] === tile[2] ? rt : tile[2] === tile[3] ? lt : up
-    let centertty = dntty(colors[tile[2]], colors[tile[2].toUpperCase()], center_char)
-    return horiztty(colors[tile[3]]) + centertty + horiztty(colors[tile[1]]) + sp()
+    if (top) {
+      value = uptty(colors[tile[0]])
+    } else {
+      const centerChar =
+        tile[1] === tile[2] ? rt : tile[2] === tile[3] ? lt : up
+      const centertty = dntty(
+        colors[tile[2]],
+        colors[tile[2].toUpperCase()],
+        centerChar,
+      )
+      value =
+        horiztty(colors[tile[3]]) + centertty + horiztty(colors[tile[1]]) + sp()
+    }
   }
-  if (top) return '??? '
-  return '\'\'\' '
+
+  set = save
+  return value || (top ? '??? ' : "''' ")
 }
 
-const print_icon = (icon, set_name) => {
-  set = color_sets[set_name] || color_sets.trax
+const mergeTentative = () => {
+  colorSets.tentative.e = set.e // Copy empty color to tentative set
+  colorSets.tentative.W = set.W
+  colorSets.tentative.B = set.B
+}
+
+const printIcon = (icon, setName) => {
+  set = colorSets[setName] || colorSets.trax
+  mergeTentative(set)
   const on = esc + '38;5;' + String(set.t) + ';48;5;' + String(set.e) + 'm'
   let o1 = '   '
   let o2 = '1  '
   let row = 1
   let width = 1
-  let info = []
-  let line_width = 0
-  while (icon.length) {
-    let c = icon[0]
+  const info = []
+  let lineWidth = 0
+  while (icon.length > 0) {
+    const c = icon[0]
     icon = icon.slice(1)
     if (c === ':') {
-      info.push({o: o1, w: line_width})
-      info.push({o: o2, w: line_width})
+      info.push({ o: o1, w: lineWidth }, { o: o2, w: lineWidth })
       row++
-      width = Math.max(width, line_width)
-      line_width = 0
+      width = Math.max(width, lineWidth)
+      lineWidth = 0
       o1 = '   '
       o2 = String(row).padEnd(3)
     } else if (c >= '0' && c <= '9') {
-      let empty = Number(c) + 1
+      const empty = Number(c) + 1
       o1 += ' '.repeat(empty * 4)
       o2 += ' '.repeat(empty * 4)
-      line_width += empty
+      lineWidth += empty
     } else {
-      o1 += tile_tty(c, 'top')
-      o2 += tile_tty(c)
-      line_width++
+      o1 += tileTty(c, 'top')
+      o2 += tileTty(c)
+      lineWidth++
     }
   }
-  if (o1.length) {
-    info.push({o: o1, w: line_width})
-    info.push({o: o2, w: line_width})
-    width = Math.max(width, line_width)
+
+  if (o1.length > 0) {
+    info.push({ o: o1, w: lineWidth }, { o: o2, w: lineWidth })
+    width = Math.max(width, lineWidth)
   }
-  let columns = process.stdout.columns || 0
-  let rows = process.stdout.rows || 0
+
+  const columns = process.stdout.columns || 0
+  const rows = process.stdout.rows || 0
   if (width * 4 < columns - 4 && info.length < rows - 2) {
-    let col_out = '   '
+    let colOut = '   '
     for (let col = 1; col <= width; col++) {
-      col_out += ' ' + Trax.column(col).padEnd(3)
+      colOut += ' ' + Trax.column(col).padEnd(3)
     }
-    console.info(on + col_out.padEnd((width + 1) * 4) + off)
-    info.forEach(line => console.info(on + line.o + ''.padEnd((width - line.w) * 4) + ' ' + off))
+
+    console.info(on + colOut.padEnd((width + 1) * 4) + off)
+    for (const line of info)
+      console.info(on + line.o + ''.padEnd((width - line.w) * 4) + ' ' + off)
     console.info(on + ''.padEnd((width + 1) * 4) + off)
   } else {
     console.warn('Console is too small to display this game')
   }
 }
 
-// flexible way to get a Trax game object
+// Flexible way to get a Trax game object
 //    game = existing Trax instance, or a string indicating the variant name
 //    moves = optional list or string of moves to be made on the game
 // returns a Trax instance
-const trax_game = (game='trax', moves) => {
+export const traxGame = (game = 'trax', moves = '') => {
   let trax
   if (game instanceof Trax) {
     trax = game
     if (moves) {
       if (typeof moves === 'string') moves = moves.split(' ')
-      moves.forEach(move => trax.drop_tile(move))
+      for (const move of moves) trax.dropTile(move)
     }
   } else {
     trax = new Trax(game, moves, 'cli')
   }
+
   return trax
 }
 
-const display_game = (game='trax', moves='') => {
-  let trax = trax_game(game, moves)
+export const displayGame = (game = 'trax', moves = '', tentative = false) => {
+  const trax = traxGame(game, moves)
+  let { icon } = trax
+  if (tentative) {
+    const drops = trax.dropTile(tentative)
+    if (drops.valid) {
+      icon = trax.tentativeIcon(drops)
+    } else {
+      tentative = false
+    }
+  }
+
   console.info(trax.notation)
-  print_icon(trax.icon, trax.rules)
-  let name = {0: 'nobody', 1: 'white', 2: 'black'}[trax.turn]
+  printIcon(icon, trax.rules)
+  if (tentative) console.info('--- tentative position ---')
+  const name = { 1: 'white', 2: 'black' }[trax.turn]
   if (trax.over) {
     if (trax.turn) {
       console.info(name + ' wins')
     } else {
-      console.info('game ended in a draw')
+      console.info('game end' + (tentative ? 's' : 'ed') + ' in a draw')
     }
   } else if (trax.turn) {
-    console.info(name +' to play')
+    console.info((tentative ? 'leaving ' : '') + name + ' to play')
   }
 }
-
-export default {
-  display: display_game,
-  game: trax_game,
-  out,
-}