@slugbugblue/trax 0.8.0 → 0.10.1

package/src/cmds/play-try.js

@@ -0,0 +1,129 @@
+/* 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 play/try commands
+
+const moveRx = /^\d+\.?$/
+const notationRx = /^[@a-z]+\d+[bps/\\+]$/i
+
+export const playCmd = {
+  name: 'play',
+  alt: ['move', 'mv'],
+  args: '<move> [...]',
+  comp: '<play>',
+  desc: 'play a move',
+  rx: [moveRx, notationRx],
+  help: [
+    'Enter the move in standard Trax notation. The final character of the',
+    'notation can be replaced with a letter for ease of entering at the',
+    'command line. Use <s> for "/", <b> for "\\", and <p> for "+".',
+    'Multiple moves can be submitted at once. Move numbers are optional,',
+    'but if included, they will be checked for accuracy.',
+  ],
+}
+
+export const tryCmd = {
+  name: 'try',
+  alt: 'see',
+  args: '<move>',
+  comp: '<play>',
+  desc: 'see the effects of a move',
+  help: [
+    'View a move without committing to it. This is useful for seeing the',
+    'effects of forced tiles.',
+  ],
+}
+
+const fixNotation = (move) => {
+  if (move.endsWith('b')) return move.slice(0, -1) + '\\'
+  if (move.endsWith('s')) return move.slice(0, -1) + '/'
+  if (move.endsWith('p')) return move.slice(0, -1) + '+'
+  return move
+}
+
+playCmd.fn = (CLI, ...moves) => {
+  if (moves.length === 0 || !moves[0]) {
+    CLI.error('You must provide a move.')
+    return CLI.do('help', 'play')
+  }
+
+  if (!CLI.GAME?.id) {
+    CLI.do('new')
+  }
+
+  if (CLI.TRAX.over) {
+    return CLI.error('The game is over.')
+  }
+
+  const start = CLI.TRAX.move
+  let checkMove
+
+  for (let move of moves) {
+    if (notationRx.test(move)) {
+      const moveNumber = CLI.TRAX.move
+      move = fixNotation(move)
+      if (checkMove) {
+        CLI.TRAX.playMove(checkMove, move)
+      } else {
+        CLI.TRAX.play(move)
+      }
+
+      if (CLI.TRAX.move === moveNumber) {
+        CLI.error(
+          'Move "' +
+            (checkMove ? checkMove + '. ' : '') +
+            move +
+            '" is invalid.',
+        )
+      }
+    } else if (moveRx.test(move)) {
+      checkMove = Number(move)
+    } else if (move) {
+      CLI.error('Move "' + move + '" is not in the correct notation.')
+    }
+  }
+
+  if (CLI.TRAX.move !== start) {
+    CLI.updateGameData()
+    CLI.do('view')
+  }
+}
+
+tryCmd.fn = (CLI, move) => {
+  if (move.length === 0) {
+    CLI.error('You must provide a move.')
+    return CLI.do('help', 'try')
+  }
+
+  if (!CLI.TRAX) {
+    CLI.do('new')
+  }
+
+  if (CLI.TRAX.over) {
+    return CLI.error('The game is over.')
+  }
+
+  if (notationRx.test(move)) {
+    move = fixNotation(move)
+    const play = CLI.TRAX.dropTile(move, undefined, 'tentative')
+    if (play.valid || play.dropped.length > 0) {
+      CLI.display(CLI.TRAX, CLI.GAME.players, move)
+    } else {
+      CLI.error('Move is invalid.')
+    }
+  } else {
+    CLI.error('Move is invalid.')
+  }
+}

package/src/cmds/select.js

@@ -0,0 +1,47 @@
+/* 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 select command
+
+export const selectCmd = {
+  name: 'select',
+  alt: ['choose', '#'],
+  args: '#id [command]',
+  comp: '<id> <cmd>',
+  desc: 'select a different game',
+  rx: /^#\d+$/,
+  help: [
+    'Make another game the default game of future commands. If another',
+    'command is included, that command will be run immediately.',
+  ],
+}
+
+selectCmd.fn = (CLI, id, ...cmds) => {
+  if (!id) {
+    CLI.error('Missing id.')
+    return CLI.do('help', 'select')
+  }
+
+  if (id.startsWith('#')) id = id.slice(1)
+  CLI.load(id)
+  if (String(CLI.GAME?.id) === id) {
+    CLI.out(CLI.color(`Game #${id} selected.`))
+    if (cmds.length > 0) {
+      CLI.doNext(cmds.join(' '))
+    }
+  } else {
+    CLI.error('Invalid id. Type "list" to see available games.')
+  }
+}

package/src/cmds/undo.js

@@ -0,0 +1,40 @@
+/* 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 undo command
+
+export const undoCmd = {
+  name: 'undo',
+  args: '[n]',
+  comp: '<move>',
+  desc: 'undo the last move in a game',
+  help: [
+    'Backtrack one or more moves in a game. Type "undo" to take back the last',
+    'move, or "undo 2" to undo the last two moves.',
+  ],
+}
+
+undoCmd.fn = (CLI, n) => {
+  n = Math.max(1, Math.floor(Number(n) || 1)) // Get an integer 1 or higher
+
+  const { moves } = CLI.TRAX
+  const undo = moves.slice(0, 0 - n)
+  if (moves.length === undo.length) {
+    CLI.error('Unable to undo.')
+  } else {
+    CLI.setGame(undo)
+    CLI.do('view')
+  }
+}

package/src/cmds/view.js

@@ -0,0 +1,53 @@
+/* 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 view command
+
+export const viewCmd = {
+  name: 'view',
+  alt: ['show', 'display'],
+  args: '[move number]',
+  comp: '<move>',
+  desc: 'show the game board',
+  help: [
+    'Show the current game. Include a move number to see the board as it was at',
+    'that move.',
+  ],
+}
+
+viewCmd.fn = (CLI, move) => {
+  if (!CLI.GAME?.id) {
+    return CLI.error('No active game. Type "new" to start a game.')
+  }
+
+  const trax = CLI.TRAX
+
+  let show = Number.POSITIVE_INFINITY
+  if (move && Number(move) >= 0 && Number(move) <= trax.moves.length) {
+    show = Number(move)
+  }
+
+  const players = CLI.GAME.players || ['white', 'black']
+
+  CLI.out(
+    CLI.color('#' + CLI.ID + ' ') +
+      CLI.name(trax.rules) +
+      ' ' +
+      CLI.bubble('w' + (trax.turn === 1 ? 'h' : ''), players[0]) +
+      CLI.color(' vs ') +
+      CLI.bubble('b' + (trax.turn === 2 ? 'h' : ''), players[1]),
+  )
+  CLI.display(trax, players, false, show)
+}

package/src/point.js

@@ -23,6 +23,8 @@ export const Point = class {
   #x = 0
   #y = 0
 
+  static dirs = ['up', 'down', 'left', 'right']
+
   constructor(x, y) {
     if (is(x, 'obj') && is(x.x, 'num') && is(x.y, 'num')) {
       // You can call this with new Point(point) or new Point({x,y})
@@ -76,6 +78,7 @@ export const Point = class {
   dir(direction) {
     const error = 'direction must be one of: up, down, left, right, u, d, l, r'
     if (!is(direction, 'str')) throw new SyntaxError(error)
+    direction = direction.toLowerCase()
     if (direction[0] === 'u') return this.up
     if (direction[0] === 'd') return this.down
     if (direction[0] === 'l') return this.left
@@ -99,6 +102,15 @@ export const Point = class {
     return this.#x === that.x && this.#y === that.y
   }
 
+  in(topLeft, bottomRight) {
+    return (
+      this.x >= topLeft.x &&
+      this.x <= bottomRight.x &&
+      this.y >= topLeft.y &&
+      this.y <= bottomRight.y
+    )
+  }
+
   // Play nicely with the rest of the world
 
   toString() {

package/src/tty.js

@@ -24,12 +24,10 @@ const off = esc + 'm' // Color reset code
 
 // 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
+  return esc + c.join(';') + 'm' + contents
 }
 
 // Display a message with optional color
@@ -229,14 +227,14 @@ export const traxGame = (game = 'trax', moves = '') => {
   return trax
 }
 
-const printNotation = (trax, tentative) => {
+const printNotation = (trax, tentative, show = Number.POSITIVE_INFINITY) => {
   let b = false
   let n = 1
   let out = ''
   let length = 0
-  const t = tentative ? trax.moves.length : 0
+  const t = tentative ? trax.moves.length - 1 : show
   for (const move of trax.moves) {
-    const c = (b ? 'b' : 'w') + (t === n ? 'd' : '')
+    const c = (b ? 'b' : 'w') + (t < n ? 'd' : show === n ? 'h' : '')
     const notation = String(n) + ' ' + move
     if (length + notation.length + 3 > process.stdout.columns) {
       out += '\n'
@@ -252,7 +250,12 @@ const printNotation = (trax, tentative) => {
   outty(out)
 }
 
-export const display = (game, players, tentative = false) => {
+export const display = (
+  game,
+  players,
+  tentative = false,
+  showMove = Number.POSITIVE_INFINITY,
+) => {
   const trax = traxGame(game)
   const saved = trax.save()
   const colors = ['white', 'black']
@@ -265,9 +268,13 @@ export const display = (game, players, tentative = false) => {
     } else {
       tentative = false
     }
+  } else if (showMove <= trax.moves.length) {
+    icon = trax.dropsIcon({
+      dropped: Object.values(trax.tiles).filter((t) => t.move > showMove),
+    })
   }
 
-  printNotation(trax, tentative)
+  printNotation(trax, tentative, showMove)
   printIcon(icon, trax.rules)
   const nameColor = { 1: 'w', 2: 'b' }[trax.turn]
   if (tentative) {

package/src/version.js

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