@slugbugblue/trax 0.7.0 → 0.8.0

package/{engine.js → src/engine.js}

@@ -24,7 +24,7 @@ import { Point } from './point.js'
 // Fun trax helper constants
 
 const zero = new Point(0, 0)
-const notationRegex = /^ *([@a-z]+) *(\d+) *([/\\+]) *$/i
+const notationRegex = /^([@a-z]+)(\d+)([/\\+])$/i
 
 const slash = { a: '\\', b: '+', c: '/', d: '/', e: '+', f: '\\' }
 
@@ -72,7 +72,13 @@ const codeRowLength = (row) =>
 // This is where the magic happens
 export const Trax = class {
   // Static class properties
-  static variants = new Set(['trax', 'traxloop', 'trax8']) // Known variants
+  static names = {
+    trax: 'Trax',
+    traxloop: 'Loop Trax',
+    trax8: '8x8 Trax',
+  }
+
+  static variants = new Set(Object.keys(this.names)) // Known variants
 
   // Static class methods
   static point = (x, y) => new Point(x, y)
@@ -122,13 +128,9 @@ export const Trax = class {
     // Moves might be a notation string
     if (moves) {
       if (typeof moves === 'string') moves = moves.split(/\s+/)
-      for (let move of moves) {
-        if (typeof move === 'string') {
-          move = { move: this.move, notation: move }
-        }
-
-        if (notationRegex.test(move.notation)) {
-          this.playMove(move.move, move.notation)
+      for (const move of moves) {
+        if (notationRegex.test(move)) {
+          this.dropTile(move)
         }
       }
     }
@@ -170,6 +172,11 @@ export const Trax = class {
     }
   }
 
+  get name() {
+    // Get the name of this variant
+    return Trax.names[this.rules]
+  }
+
   get count() {
     // Get the number of tiles currently in play
     return Object.keys(this.tiles).length
@@ -433,9 +440,9 @@ export const Trax = class {
     return this.dropTile(notation)
   }
 
-  playMove(currentMoveNumber, nextMoveNotation) {
-    // Generic API call for dropTile
-    if (currentMoveNumber === this.move) return this.dropTile(nextMoveNotation)
+  playMove(moveNumber, notation) {
+    // Generic API call for playing a move with move number safety
+    if (moveNumber === this.move + 1) return this.dropTile(notation)
     return { valid: false }
   }
 
@@ -482,7 +489,7 @@ export const Trax = class {
         loc = decoded.loc
       }
 
-      if (this.validLocation(loc) && this.validTile(type, loc)) {
+      if (loc && this.validLocation(loc) && this.validTile(type, loc)) {
         valid = true
         const saved = this.save() // Just in case we need to roll back
         notation = this.notate(type, loc) // Determine notation BEFORE we play the move

package/{tty.js → src/tty.js}

@@ -22,13 +22,19 @@ import { Trax } from './engine.js'
 const esc = '\u001B[' // Start of console color escape code
 const off = esc + 'm' // Color reset code
 
-// display a message with optional color
+// Colorize a string
+export const color = (contents = '', fgcolor = '', bgcolor = '') => {
+  let ansi = esc
+  const c = []
+  if (fgcolor) c.push('38;5;' + fgcolor)
+  if (bgcolor) c.push('48;5;' + bgcolor)
+  ansi += c.join(';') + 'm'
+  return ansi + contents
+}
+
+// Display a message with optional color
 export const outty = (message, fgcolor, bgcolor) => {
-  let ansi = fgcolor || bgcolor ? esc : ''
-  if (fgcolor) ansi += '38;5;' + fgcolor
-  if (bgcolor) ansi += '48;5;' + bgcolor
-  if (ansi) ansi += 'm'
-  console.log(ansi + message + off)
+  console.log(color(message, fgcolor, bgcolor) + off)
 }
 
 let set = 'trax' // Which color set should we draw with?
@@ -44,6 +50,28 @@ const colorSets = {
   tentative: { b: 235, B: 18, e: 19, t: 244, w: 252, W: 217 },
 }
 
+export const name = (rules) => {
+  if (Trax.variants.has(rules)) {
+    return color(Trax.names[rules], colorSets[rules].t)
+  }
+
+  return rules
+}
+
+export const bubble = (clr, text) => {
+  const colors = {
+    w: { fg: 236, bg: 153 },
+    b: { fg: 250, bg: 18 },
+    wd: { fg: 236, bg: 248 },
+    bd: { fg: 248, bg: 236 },
+    wh: { fg: 63, bg: 123 },
+    bh: { fg: 220, bg: 20 },
+  }
+
+  const c = colors[clr]
+  return color('', c.bg) + color(text, c.fg, c.bg) + off + color('', c.bg)
+}
+
 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
@@ -201,29 +229,67 @@ export const traxGame = (game = 'trax', moves = '') => {
   return trax
 }
 
-export const displayGame = (game = 'trax', moves = '', tentative = false) => {
-  const trax = traxGame(game, moves)
+const printNotation = (trax, tentative) => {
+  let b = false
+  let n = 1
+  let out = ''
+  let length = 0
+  const t = tentative ? trax.moves.length : 0
+  for (const move of trax.moves) {
+    const c = (b ? 'b' : 'w') + (t === n ? 'd' : '')
+    const notation = String(n) + ' ' + move
+    if (length + notation.length + 3 > process.stdout.columns) {
+      out += '\n'
+      length = 0
+    }
+
+    out += bubble(c, notation) + ' '
+    length += notation.length + 3
+    b = !b
+    n++
+  }
+
+  outty(out)
+}
+
+export const display = (game, players, tentative = false) => {
+  const trax = traxGame(game)
+  const saved = trax.save()
+  const colors = ['white', 'black']
+  if (!Array.isArray(players)) players = colors
   let { icon } = trax
   if (tentative) {
     const drops = trax.dropTile(tentative)
-    if (drops.valid) {
+    if (drops.valid || drops.dropped.length > 0) {
       icon = trax.dropsIcon(drops)
     } else {
       tentative = false
     }
   }
 
-  console.info(trax.notation)
+  printNotation(trax, tentative)
   printIcon(icon, trax.rules)
-  if (tentative) console.info('--- tentative position ---')
-  const name = { 1: 'white', 2: 'black' }[trax.turn]
+  const nameColor = { 1: 'w', 2: 'b' }[trax.turn]
+  if (tentative) {
+    const otherColor = { w: 'bd', b: 'wd' }[nameColor] || 'wd'
+    outty('---' + bubble(otherColor, 'tentative position') + off + '---')
+  }
+
+  const name = players[trax.turn - 1] || colors[trax.turn - 1]
   if (trax.over) {
     if (trax.turn) {
-      console.info(name + ' wins')
+      outty(bubble(nameColor + 'h', name) + off + ' wins')
     } else {
-      console.info('game end' + (tentative ? 's' : 'ed') + ' in a draw')
+      outty('game end' + (tentative ? 's' : 'ed') + ' in a draw')
     }
   } else if (trax.turn) {
-    console.info((tentative ? 'leaving ' : '') + name + ' to play')
+    outty(
+      (tentative ? 'leaving ' : '') +
+        bubble(nameColor, name) +
+        off +
+        ' to play',
+    )
   }
+
+  if (tentative) trax.restore(saved)
 }

package/src/version.js

@@ -0,0 +1,2 @@
+// Generated by genversion.
+export const version = '0.8.0'