@slugbugblue/trax-cli 0.13.0 → 0.14.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @slugbugblue/trax
 
+## 0.14.0 - 2026-06-05
+
+- Update to latest puzzles version with new defensive move format
+- Change trax game export attribution
+- Break out inner logic to new functions in a few complex functions
+
 ## 0.13.0 - 2026-05-20
 
 - Update to latest puzzles version and add defensive moves

package/README.md

@@ -77,7 +77,7 @@ simply `#1` at the interactive prompt.
 For ease of working at the command line, the symbols used as the last character
 of the Trax notation can optionally be replaced with letters. Use `s` for slash
 symbol (`/`), `b` for backslash (`\`), and `p` for plus (`+`). While there is no
-need to escape at the interactive prompt, these substitutions will be avilable
+need to escape at the interactive prompt, these substitutions will be available
 there as well.
 
 ### Examples

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slugbugblue/trax-cli",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Trax command line interface",
   "keywords": [
     "trax",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@slugbugblue/trax": "^1.0.0",
     "@slugbugblue/trax-analyst": "^0.14.0",
-    "@slugbugblue/trax-puzzles": "^0.8.0",
+    "@slugbugblue/trax-puzzles": "^0.9.0",
     "@slugbugblue/trax-tty": "^1.0.0",
     "env-paths": "^4.0.0",
     "yaml": "^2.0.0-11"

package/src/cmds/import-export.js

@@ -169,6 +169,31 @@ export const importCmd = {
   },
 }
 
+/** Generate puzzle attribution comment lines for export.
+ * @param {CLIContext['GAME']} game - the current game
+ * @returns {string} - formatted attribution string, or empty if no puzzle
+ */
+const puzzleAttribution = (game) => {
+  if (!game.puzzle) return ''
+  const puzzle = puzzles.find((p) => p.id === game.puzzle)
+  if (!puzzle) return ''
+  const source = sources[puzzle.src]
+  let attr = '; Puzzle ' + game.puzzle
+  if (source) {
+    attr += source.copyright
+      ? ' ©' + source.copyright + ' by '
+      : ' provided courtesy of '
+    attr += source.name
+    if (source.url) attr += '\n; ' + source.url
+    if (source.license) {
+      attr += '\n; Licensed under ' + source.license
+      attr += source.licenseUrl ? ' ' + source.licenseUrl : ''
+    }
+  }
+
+  return attr + '\n'
+}
+
 export const exportCmd = {
   name: 'export',
   alt: ['save', 'keep', 'share'],
@@ -202,28 +227,8 @@ export const exportCmd = {
     content += game.players?.[0] || 'white'
     content += ' vs '
     content += game.players?.[1] || 'black'
-    content += '\n; @slugbugblue/trax cli.js v' + CLI.version + '\n'
-    if (game.puzzle) {
-      const puzzle = puzzles.find((p) => p.id === game.puzzle)
-      if (puzzle) {
-        const source = sources[puzzle.src]
-        content += '; Puzzle ' + game.puzzle
-        if (source) {
-          content += source.copyright
-            ? ' ©' + source.copyright + ' by '
-            : ' provided courtesy of '
-          content += source.name
-          if (source.url) content += '\n; ' + source.url
-          if (source.license) {
-            content += '\n; Licensed under ' + source.license
-            content += source.licenseUrl ? ' ' + source.licenseUrl : ''
-          }
-        }
-
-        content += '\n'
-      }
-    }
-
+    content += '\n; @slugbugblue/trax-cli v' + CLI.version + '\n'
+    content += puzzleAttribution(game)
     content += interleaveNotation(trax.moves, game.notes)
 
     filename &&= filename.replaceAll(/[^ a-z\d.~\/]/gv, '')
@@ -250,21 +255,48 @@ export const exportCmd = {
 const getRules = (r) =>
   r.includes('loop') ? 'traxloop' : r.includes('8x8') ? 'trax8' : 'trax'
 
-/** Decode a .trx formatted string into a game, preserving players and comments.
- * @param {CLIContext} CLI - the CLI object
+/** Apply pending moves to the game, or record them as notes if the game is over.
+ * @param {string[]} moves - pending move tokens (mutated in place)
+ * @param {Trax} trax - the current game instance
+ * @param {GameNotes} notes - notes accumulator
+ */
+const applyMoves = (moves, trax, notes) => {
+  if (trax.gameOver) {
+    notes.push({ note: moves.map((c) => c.trim()).join(' '), move: trax.move })
+  } else {
+    trax.playMoves(moves.filter(Boolean))
+    moves.splice(0)
+  }
+}
+
+/** Record a comment segment as a note, unless it is the generator attribution.
+ * @param {string[]} comment - comment tokens from after the # or ; delimiter
+ * @param {Trax | undefined} trax - the current game instance, if initialized
+ * @param {GameNotes} notes - notes accumulator
+ */
+const collectComment = (comment, trax, notes) => {
+  if (comment.length === 0) return
+  const note = comment.map((c) => c.trim()).join(' ')
+  if (!/^@slugbugblue\/trax-cli v/v.test(note)) {
+    notes.push({ note, move: trax?.move || 0 })
+  }
+}
+
+/** Parse a .trx formatted string into structured game data.
  * @param {string} content - the contents of the .trx file
- * @returns {boolean} - true if a game was created
+ * @returns {{ rules: TraxVariant, players: string[], trax: Trax, notes: GameNotes } | null} - parsed game data, or null if invalid
  */
-const interpretFile = (CLI, content) => {
+const parseFile = (content) => {
   /** @type {TraxVariant | undefined} */
   let rules
+  /** @type {Trax | undefined} */
   let trax
   /** @type {string[]} */
   let players = []
   /** @type {string[]} */
   const moves = []
   /** @type {GameNotes} */
-  const comments = []
+  const notes = []
   for (const line of content.split('\n')) {
     if (!line) continue
     const [ln, ...comment] = line.split(/[#;]/v)
@@ -284,33 +316,29 @@ const interpretFile = (CLI, content) => {
     }
 
     if (moves.length > 0) {
-      if (!trax) return false
-      if (trax.gameOver) {
-        comments.push({
-          note: moves.map((c) => c.trim()).join(' '),
-          move: trax.move,
-        })
-      } else {
-        trax.playMoves(moves.filter(Boolean))
-        moves.splice(0)
-      }
+      if (!trax) return null
+      applyMoves(moves, trax, notes)
     }
 
-    if (comment.length > 0) {
-      const note = comment.map((c) => c.trim()).join(' ')
-      if (!/^@slugbugblue\/trax cli\.js v/v.test(note)) {
-        comments.push({
-          note,
-          move: trax?.move || 0,
-        })
-      }
-    }
+    collectComment(comment, trax, notes)
   }
 
-  if (!trax) return false
+  if (!trax || !rules) return null
+  return { rules, players, trax, notes }
+}
+
+/** Decode a .trx formatted string into a game, preserving players and comments.
+ * @param {CLIContext} CLI - the CLI object
+ * @param {string} content - the contents of the .trx file
+ * @returns {boolean} - true if a game was created
+ */
+const interpretFile = (CLI, content) => {
+  const parsed = parseFile(content)
+  if (!parsed) return false
 
+  const { rules, players, trax, notes } = parsed
   CLI.do('new', rules, ...players)
-  CLI.GAMES[String(CLI.GAME.id)].notes = comments
+  CLI.GAMES[String(CLI.GAME.id)].notes = notes
   if (trax.moves.length > 0) {
     CLI.do('play', ...trax.moves)
   } else {

package/src/cmds/list.js

@@ -49,7 +49,6 @@ export const listCmd = {
       p1: 1,
       p2: 1,
     }
-    let noteSize = Number.POSITIVE_INFINITY
 
     for (const game of Object.values(CLI.GAMES)) {
       const moves = game.moves.length === 0 ? 0 : game.moves.split(' ').length
@@ -70,32 +69,41 @@ export const listCmd = {
     }
 
     list = listSort(list, filters)
+    renderList(CLI, list, size)
+  },
+}
 
-    for (const game of list) {
-      size.id = Math.max(size.id, String(game.id).length)
-      size.name = Math.max(size.name, Number(game.name))
-      size.moves = Math.max(size.moves, String(game.moves).length)
-      size.p1 = Math.max(size.p1, String(game.p1).length)
-      size.p2 = Math.max(size.p2, String(game.p2).length)
-      noteSize = Math.min(noteSize, leftover(size))
-    }
+/**
+ * @param {CLIContext} CLI - the CLI object
+ * @param {Array<Record<string, string | number | boolean | undefined>>} list - sorted game list
+ * @param {Record<string, number>} size - initial column width minimums
+ */
+const renderList = (CLI, list, size) => {
+  let noteSize = Number.POSITIVE_INFINITY
+  for (const game of list) {
+    size.id = Math.max(size.id, String(game.id).length)
+    size.name = Math.max(size.name, Number(game.name))
+    size.moves = Math.max(size.moves, String(game.moves).length)
+    size.p1 = Math.max(size.p1, String(game.p1).length)
+    size.p2 = Math.max(size.p2, String(game.p2).length)
+    noteSize = Math.min(noteSize, leftover(size))
+  }
 
-    for (const game of list) {
-      CLI.out(
-        CLI.color(String(game.id).padStart(size.id) + ' ') +
-          Trax.names[
-            /** @type {import('../cli.js').TraxVariant} */ (String(game.rules))
-          ] +
-          ' '.repeat(size.name - Number(game.name) + 1) +
-          CLI.bubble(game.turn === 1 ? 'wh' : 'w', String(game.p1)) +
-          CLI.color('vs '.padStart(size.p1 - String(game.p1).length + 4)) +
-          CLI.bubble(game.turn === 2 ? 'bh' : 'b', String(game.p2)) +
-          CLI.color(' '.padStart(size.p2 - String(game.p2).length + 1)) +
-          CLI.color(String(game.moves).padEnd(size.moves)) +
-          CLI.color.help(' ' + String(game.note).slice(0, noteSize)),
-      )
-    }
-  },
+  for (const game of list) {
+    CLI.out(
+      CLI.color(String(game.id).padStart(size.id) + ' ') +
+        Trax.names[
+          /** @type {import('../cli.js').TraxVariant} */ (String(game.rules))
+        ] +
+        ' '.repeat(size.name - Number(game.name) + 1) +
+        CLI.bubble(game.turn === 1 ? 'wh' : 'w', String(game.p1)) +
+        CLI.color('vs '.padStart(size.p1 - String(game.p1).length + 4)) +
+        CLI.bubble(game.turn === 2 ? 'bh' : 'b', String(game.p2)) +
+        CLI.color(' '.padStart(size.p2 - String(game.p2).length + 1)) +
+        CLI.color(String(game.moves).padEnd(size.moves)) +
+        CLI.color.help(' ' + String(game.note).slice(0, noteSize)),
+    )
+  }
 }
 
 /** @param {string} a @param {string} b @returns {number} */

package/src/cmds/new.js

@@ -68,6 +68,7 @@ const pairs = [
   ['Aang', 'Katara'],
   ['Abbott', 'Costello'],
   ['Adam', 'Eve'],
+  ['Ali', 'Frazier'],
   ['Anne Boleyn', 'Henry VIII'],
   ['Ash', 'Pikachu'],
   ['Barbie', 'Ken'],
@@ -80,12 +81,15 @@ const pairs = [
   ['Chip', 'Dale'],
   ['Donald', 'Daisy'],
   ['Depp', 'Heard'],
+  ['Dorothy', 'Toto'],
   ['Fred', 'Barney'],
   ['Fred', 'George'],
+  ['Frida', 'Diego'],
   ['Frodo', 'Samwise'],
   ['Hamilton', 'Burr'],
   ['Han', 'Chewie'],
   ['Harry', 'Ron'],
+  ['Hatfield', 'McCoy'],
   ['Holmes', 'Moriarty'],
   ['Holmes', 'Watson'],
   ['Iñigo', 'Fezzik'],
@@ -109,6 +113,7 @@ const pairs = [
   ['Pan', 'Hook'],
   ['Phineas', 'Ferb'],
   ['player 1', 'player 2'],
+  ['p1', 'p2'],
   ['Potter', 'Voldemort'],
   ['R2-D2', 'C-3PO'],
   ['Ren', 'Stimpy'],
@@ -121,6 +126,7 @@ const pairs = [
   ['Snoopy', 'Woodstock'],
   ['Sonny', 'Cher'],
   ['Spongebob', 'Patrick'],
+  ['Sully', 'Neytiri'],
   ['Tarzan', 'Jane'],
   ['Thelma', 'Louise'],
   ['Thing 1', 'Thing 2'],

package/src/cmds/play-try.js

@@ -149,18 +149,24 @@ const matchesToken = (move, token) => {
 
 /**
  * Find the defense move for the current puzzle state, if one exists.
+ * First checks position-code keys (exact board-state match, O(1)), then
+ * falls back to wildcard notation keys for paths containing '*'.
  * @param {import('@slugbugblue/trax-puzzles').Defense} defense
+ * @param {string} positionCode
  * @param {string[]} moves
  * @returns {string | undefined}
  */
-const getDefenseMove = (defense, moves) => {
-  const key = Object.keys(defense).find((k) => {
-    const tokens = k.split(' ')
-    return (
-      tokens.length === moves.length &&
-      tokens.every((token, i) => matchesToken(moves[i], token))
-    )
-  })
+const getDefenseMove = (defense, positionCode, moves) => {
+  if (Object.hasOwn(defense, positionCode)) return defense[positionCode]
+  const key = Object.keys(defense)
+    .filter((k) => k.includes('*'))
+    .find((k) => {
+      const tokens = k.split(' ')
+      return (
+        tokens.length === moves.length &&
+        tokens.every((token, i) => matchesToken(moves[i], token))
+      )
+    })
   return key ? defense[key] : undefined
 }
 
@@ -194,7 +200,11 @@ const bot = (CLI) => {
       const puzzle = puzzles.find((p) => p.id === game.puzzle)
       if (puzzle?.defense) {
         const offset = puzzle.notation.split(' ').length
-        move = getDefenseMove(puzzle.defense, trax.moves.slice(offset))
+        move = getDefenseMove(
+          puzzle.defense,
+          trax.positionCode(),
+          trax.moves.slice(offset),
+        )
       }
     }
 

package/src/version.js

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