@slugbugblue/trax 0.1.0 → 0.2.0

package/.eslintrc.yaml

@@ -36,7 +36,7 @@ rules:
     - unix
   max-len:
     - warn
-    - code: 119
+    - code: 99
       tabWidth: 2
   no-alert: error
   no-caller: error

package/engine.js

@@ -1,11 +1,11 @@
 /* Copyright 2021 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.
@@ -19,6 +19,7 @@
 // and then sorted alphabetically and given a single letter name, so 'bbww' becomes 'a'
 // which gives us six different tile names: a-f
 
+const variants = ['trax', 'traxloop', 'trax8']  // known variants
 
 // fun trax helper constants
 
@@ -33,7 +34,9 @@ const symmetry = {  // convert tile to different views
 
 const notation_regex = /^ *([@a-z]+) *(\d+) *([/\\+]) *$/i
 
-const variants = ['trax', 'traxloop', 'trax8']  // known variants
+const color_of = { 1: 'w', 2: 'b' }
+const player_num = { b: 2, w: 1 }
+const other = { b: 'w', w: 'b' }
 
 // fun trax helper functions
 
@@ -128,6 +131,10 @@ const Trax = class {
     this.invalid = saved.invalid
   }
 
+  get color () {  // get the color of the current player (w or b)
+    return color_of[this.turn]
+  }
+
   get game_over () { // returns true if the game is over
     return this.over
   }
@@ -194,7 +201,10 @@ const Trax = class {
       if (this.width > 7 && (x < this.left || x > this.right)) return false
       if (this.height > 7 && (y < this.top || y > this.bottom)) return false
     }
-    return this.tile_at(x-1, y) || this.tile_at(x+1, y) || this.tile_at(x, y-1) || this.tile_at(x, y+1)
+    return Boolean(
+      this.tile_at(x-1, y) || this.tile_at(x+1, y) ||
+      this.tile_at(x, y-1) || this.tile_at(x, y+1)
+    )
   }
 
   possible_locations () {
@@ -293,7 +303,7 @@ const Trax = class {
 
   check_win (tiles) {
     let winner = false
-    let colors = this.turn === 1 ? ['w', 'b'] : ['b', 'w'] // check win for current player first
+    let colors = [ this.color, other[this.color] ]  // check win for current player first
     colors.forEach(color => {
       if (winner) return // skip the second player if the first has won
       tiles.forEach(tile => {
@@ -314,12 +324,14 @@ const Trax = class {
     })
     if (winner) {
       this.over = true
-      this.turn = winner === 'w' ? 1 : 2
+      this.turn = player_num[winner]
     } else {
       // 8x8 Trax can end in a tie once there are no valid moves left
-      if (this.rules === 'trax8' && this.possible_moves().length < 1) {
-        this.over = true
-        this.turn = 0 // tie
+      if (this.rules === 'trax8' && this.width > 7 && this.height > 7) {
+        if (this.possible_moves().length < 1) {
+          this.over = true
+          this.turn = 0 // tie
+        }
       }
     }
   }
@@ -371,12 +383,12 @@ const Trax = class {
         this.update_notation(notation)
         dropped.push(this.add_tile(type, x, y)) // play the tile
         dropped = dropped.concat(this.forced_moves(x, y)) // play all forced moves
-        if (!tentative) this.check_win(dropped, tentative)
         if (this.invalid || tentative) {
           valid = false
           this.restore(saved) // abort! abort!
-        } else if (!this.over) {
-          this.turn = this.turn === 1 ? 2 : 1
+        } else {
+          this.check_win(dropped)
+          if (!this.over) this.turn = this.turn === 1 ? 2 : 1
         }
       }
     }
@@ -481,7 +493,7 @@ const Trax = class {
         })
       })
     })
-    return norm
+    return (this.color || 't').toUpperCase() + norm
   }
 
   get normalized () {
@@ -490,7 +502,11 @@ const Trax = class {
   }
 }
 
-Trax.column = (col) => encode_col(col)
+// add class methods
+Trax.column = encode_col
 Trax.variants = variants
+Trax.color_of = color_of
+Trax.player_num = player_num
+Trax.other = other
 
-module.exports = Trax
+export default Trax

package/jsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "es2020",
     "target": "es2020"
   },
   "checkJs": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slugbugblue/trax",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Trax game engine and friends",
   "keywords": [
     "trax",
@@ -11,10 +11,12 @@
   "bugs": "https://gitlab.com/slugbugblue/trax/issues",
   "license": "Apache-2.0",
   "author": "Chad Transtrum <chad@transtrum.net>",
-  "main": "engine.js",
+  "exports": "./engine.js",
   "repository": "gitlab:slugbugblue/trax",
   "scripts": {
-    "test": "tape tests.js"
+    "test": "tape tests.js",
+    "preversion": "npm test",
+    "postversion": "git push && git push --tags"
   },
   "devDependencies": {
     "eslint": "8.x",
@@ -22,7 +24,8 @@
     "typescript": "^4.5.4",
     "typescript-language-server": "^0.8.1"
   },
+  "type": "module",
   "engines": {
-    "node": ">=16.0.0"
+    "node": "^14.14.0 || >=16.0.0"
   }
 }

package/tty.js

@@ -1,11 +1,11 @@
 /* Copyright 2021 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.
@@ -13,17 +13,12 @@
  * limitations under the License.
  */
 
-// Console functions for Trax
+// Ever wanted to draw Trax boards on the console? I have.
 
-/* eslint-disable no-console */
-
-const Trax = require('./engine')
-
-// fix Javascript's broken typeof
-const TypeOf = o => ({}).toString.call(o).slice(8,-1)
+import Trax from './engine.js'
 
 const esc = '\x1b['  // start of console color escape code
-const off = esc + 'm'
+const off = esc + 'm'  // color reset code
 
 // display a message with optional color
 const out = (message, fgcolor, bgcolor) => {
@@ -34,34 +29,39 @@ const out = (message, fgcolor, bgcolor) => {
   console.log(ansi + message + off)
 }
 
+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
+  // 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 },
 }
 
+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
+// 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' }
+
 // return the ANSI codes to display a 3x1.5 block tile, one line at a time
-const tile_tty = (set, tile, top) => { // top: true for first line, false for second
-  const ln = 'm\u2584'  // lower half block -- with the leading m to terminate a terminal color escape sequence
-  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
-  // 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 tile_tty = (tile, top) => { // top: true for first line, false for second
   // quick access to tile color and its opposite in upper case
-  const colors = { b: 'b', w: 'w', B: 'w', W: 'b' }
+  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)
     if (tile in tiles) {
@@ -78,14 +78,14 @@ const tile_tty = (set, tile, top) => { // top: true for first line, false for se
     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
+    return horiztty(colors[tile[3]]) + centertty + horiztty(colors[tile[1]]) + sp()
   }
   if (top) return '??? '
   return '\'\'\' '
 }
 
 const print_icon = (icon, set_name) => {
-  let set = color_sets[set_name] || color_sets.trax
+  set = color_sets[set_name] || color_sets.trax
   const on = esc + '38;5;' + String(set.t) + ';48;5;' + String(set.e) + 'm'
   let o1 = '   '
   let o2 = '1  '
@@ -110,8 +110,8 @@ const print_icon = (icon, set_name) => {
       o2 += ' '.repeat(empty * 4)
       line_width += empty
     } else {
-      o1 += tile_tty(set, c, 'top')
-      o2 += tile_tty(set, c)
+      o1 += tile_tty(c, 'top')
+      o2 += tile_tty(c)
       line_width++
     }
   }
@@ -144,7 +144,7 @@ const trax_game = (game='trax', moves) => {
   if (game instanceof Trax) {
     trax = game
     if (moves) {
-      if (TypeOf(moves) === 'String') moves = moves.split(' ')
+      if (typeof moves === 'string') moves = moves.split(' ')
       moves.forEach(move => trax.drop_tile(move))
     }
   } else {
@@ -169,7 +169,7 @@ const display_game = (game='trax', moves='') => {
   }
 }
 
-module.exports = {
+export default {
   display: display_game,
   game: trax_game,
   out,