Create getNextMovable function (#27)

jsveron23 · Mar 3, 2019 · 30e9209 · 30e9209
1 parent 963288c
commit 30e9209
Show file tree

Hide file tree

Showing 11 changed files with 231 additions and 104 deletions.
diff --git a/src/actions/ingame.js b/src/actions/ingame.js
@@ -1,8 +1,8 @@
-import { compose, ifElse, reject, thunkify, flip, prop, identity } from 'ramda'
+import { compose, ifElse, reject, thunkify, flip, identity } from 'ramda'
 import * as types from '~/actions'
 import { OPPONENT } from '~/chess/constants'
 import {
-  getMovableAxis,
+  getNextMovable,
   getNextSnapshot,
   applySpecialActions,
   createTimeline
@@ -11,8 +11,6 @@ import {
   getSpecial,
   parseSelected,
   replaceSnapshot,
-  parseCode,
-  findCode,
   createSelected
 } from '~/chess/helpers'
 import { isEmpty, isExist } from '~/utils'
@@ -50,31 +48,32 @@ export function setSnapshot (snapshot) {
   }
 }
 
-export function setMovable (tile) {
+export function setNext (snapshot) {
+  return (dispatch) => {
+    dispatch(setSnapshot(snapshot))
+    dispatch(setMovableAxis())
+    dispatch(toggleTurn())
+  }
+}
+
+export function setNextMovableAxis (tile) {
   return (dispatch, getState) => {
     const { ingame } = getState()
     const { present } = ingame
     const { turn, snapshot } = present
-    const nextSelected = createSelected(tile, turn)
 
-    const flippedGetMovableAxis = compose(
-      flip,
-      getMovableAxis
-    )(tile)
+    const nextSelected = createSelected(tile, turn)
 
-    const movableAxis = compose(
-      flippedGetMovableAxis(turn),
-      prop('piece'),
-      parseCode,
-      findCode(snapshot)
-    )(tile)
+    const nextMovableAxis = getNextMovable('axis', () => {
+      return { tile, timeline: [snapshot], ...present }
+    })
 
-    dispatch(setMovableAxis(movableAxis))
+    dispatch(setMovableAxis(nextMovableAxis))
     dispatch(setSelected(nextSelected))
   }
 }
 
-export function setNext (tile) {
+export function setNextSnapshot (tile) {
   return (dispatch, getState) => {
     const { ingame } = getState()
     const { present, past } = ingame
@@ -93,13 +92,15 @@ export function setNext (tile) {
       getNextSnapshot(selected, tile)
     )(snapshot)
 
-    dispatch(setSnapshot(nextSnapshot))
-    dispatch(setMovableAxis())
-    dispatch(toggleTurn())
+    dispatch(setNext(nextSnapshot))
   }
 }
 
-export function setCapturedNext ({ capturedTile, selectedTile, nextCode }) {
+export function setNextCapturedSnapshot ({
+  capturedTile,
+  selectedTile,
+  nextCode
+}) {
   return (dispatch, getState) => {
     const { ingame } = getState()
     const { present } = ingame
@@ -110,8 +111,6 @@ export function setCapturedNext ({ capturedTile, selectedTile, nextCode }) {
       replaceSnapshot('', capturedTile)
     )(present.snapshot)
 
-    dispatch(setSnapshot(capturedSnapshot))
-    dispatch(setMovableAxis())
-    dispatch(toggleTurn())
+    dispatch(setNext(capturedSnapshot))
   }
 }
diff --git a/src/chess/core/getMovableAxis.js b/src/chess/core/getMovableAxis.js
@@ -29,11 +29,11 @@ function createMapCb (tile, turn) {
 /**
  * Get movable axis from movements of piece (no invalid axis filter here)
  * @param  {string} tile
- * @param  {string} piece
  * @param  {string} turn
+ * @param  {string} piece
  * @return {Array}
  */
-function getMovableAxis (tile, piece, turn) {
+function getMovableAxis (tile, turn, piece) {
   const mapCb = createMapCb(tile, turn)
 
   return compose(

diff --git a/src/chess/core/getNextMovable.js b/src/chess/core/getNextMovable.js
@@ -0,0 +1,44 @@
+import { compose, curry, ifElse, thunkify, prop } from 'ramda'
+import {
+  getMovableAxis,
+  getMovableTiles,
+  appendSpecialAxis,
+  rejectBlocked,
+  groupByDirection
+} from '~/chess/core'
+import { parseCode, findCode } from '~/chess/helpers'
+import { isExist } from '~/utils'
+
+/**
+ * Get next movable
+ * @param  {string}   type 'tiles', 'axis'
+ * @param  {Function} getFlatArgs
+ * @return {Array}
+ */
+function getNextMovable (type, getFlatArgs) {
+  const { turn, movableAxis, timeline, special, side, tile } = getFlatArgs()
+  const [snapshot] = timeline
+
+  if (type === 'axis') {
+    return compose(
+      getMovableAxis(tile, turn),
+      prop('piece'),
+      parseCode,
+      findCode(snapshot)
+    )(tile)
+  }
+
+  const getSpecialAxisFn = appendSpecialAxis(side, special, tile, timeline)
+
+  const getRegularAxisFn = compose(
+    rejectBlocked(turn, snapshot),
+    groupByDirection
+  )
+
+  return compose(
+    getMovableTiles,
+    ifElse(thunkify(isExist)(special), getSpecialAxisFn, getRegularAxisFn)
+  )(movableAxis)
+}
+
+export default curry(getNextMovable)
diff --git a/src/chess/core/index.js b/src/chess/core/index.js
@@ -1,5 +1,6 @@
 export { default as getMovableAxis } from './getMovableAxis'
 export { default as getMovableTiles } from './getMovableTiles'
+export { default as getNextMovable } from './getNextMovable'
 export { default as appendSpecialAxis } from './appendSpecialAxis'
 export { default as applySpecialActions } from './applySpecialActions'
 export { default as getNextSnapshot } from './getNextSnapshot'

diff --git a/src/chess/enhancePiece.js b/src/chess/enhancePiece.js
@@ -29,14 +29,14 @@ function enhancePiece (WrappedComponent, staticKey, staticTurn) {
       selectedFile: PropTypes.string,
       selectedRank: PropTypes.string,
       isMovable: PropTypes.bool,
-      setMovable: PropTypes.func,
-      setCapturedNext: PropTypes.func
+      setNextMovableAxis: PropTypes.func,
+      setNextCapturedSnapshot: PropTypes.func
     }
 
     static defaultProps = {
       isMovable: false,
-      setMovable: noop,
-      setCapturedNext: noop
+      setNextMovableAxis: noop,
+      setNextCapturedSnapshot: noop
     }
 
     getSelectedTile = memoize(createTile)
@@ -53,22 +53,22 @@ function enhancePiece (WrappedComponent, staticKey, staticTurn) {
         selectedSide,
         selectedFile,
         selectedRank,
-        setMovable,
-        setCapturedNext
+        setNextMovableAxis,
+        setNextCapturedSnapshot
       } = this.props
 
       const selectedTile = this.getSelectedTile(selectedFile, selectedRank)
       const isTurn = getSide(staticTurn) === turn
       const isCapturable = isMovable && !isTurn
 
       if (isTurn) {
-        setMovable(tile)
+        setNextMovableAxis(tile)
       }
 
       if (isCapturable) {
         const code = `${selectedSide}${selectedPiece}${tile}`
 
-        setCapturedNext({
+        setNextCapturedSnapshot({
           selectedTile,
           capturedTile: tile,
           nextCode: code

diff --git a/src/components/Diagram/index.js b/src/components/Diagram/index.js
@@ -16,9 +16,9 @@ const Diagram = (props) => {
     ranks,
     files,
     movableTiles,
-    setCapturedNext,
-    setMovable,
-    setNext
+    setNextCapturedSnapshot,
+    setNextMovableAxis,
+    setNextSnapshot
   } = props
 
   if (!isDoingMatch) {
@@ -40,9 +40,9 @@ const Diagram = (props) => {
             files={files}
             rankName={rankName}
             movableTiles={movableTiles}
-            setCapturedNext={setCapturedNext}
-            setMovable={setMovable}
-            setNext={setNext}
+            setNextCapturedSnapshot={setNextCapturedSnapshot}
+            setNextMovableAxis={setNextMovableAxis}
+            setNextSnapshot={setNextSnapshot}
           />
         )
       })}
@@ -61,15 +61,15 @@ Diagram.propTypes = {
   selectedFile: PropTypes.string,
   selectedRank: PropTypes.string,
   movableTiles: PropTypes.array,
-  setCapturedNext: PropTypes.func,
-  setMovable: PropTypes.func,
-  setNext: PropTypes.func
+  setNextCapturedSnapshot: PropTypes.func,
+  setNextMovableAxis: PropTypes.func,
+  setNextSnapshot: PropTypes.func
 }
 
 Diagram.defaultProps = {
-  setCapturedNext: noop,
-  setMovable: noop,
-  setNext: noop
+  setNextCapturedSnapshot: noop,
+  setNextMovableAxis: noop,
+  setNextSnapshot: noop
 }
 
 export default Diagram
diff --git a/src/components/File/index.js b/src/components/File/index.js
@@ -32,16 +32,16 @@ class File extends Component {
     selectedRank: PropTypes.string,
     movableTiles: PropTypes.array,
     children: PropTypes.func,
-    setCapturedNext: PropTypes.func,
-    setMovable: PropTypes.func,
-    setNext: PropTypes.func
+    setNextCapturedSnapshot: PropTypes.func,
+    setNextMovableAxis: PropTypes.func,
+    setNextSnapshot: PropTypes.func
   }
 
   static defaultProps = {
     movableTiles: [],
-    setCapturedNext: noop,
-    setMovable: noop,
-    setNext: noop
+    setNextCapturedSnapshot: noop,
+    setNextMovableAxis: noop,
+    setNextSnapshot: noop
   }
 
   isMovable = memoize(includes)
@@ -50,14 +50,14 @@ class File extends Component {
   handleClick (evt) {
     evt.preventDefault()
 
-    const { tile, children, movableTiles, setNext } = this.props
+    const { tile, children, movableTiles, setNextSnapshot } = this.props
     const shouldSetNext = compose(
       and(isEmpty(children)),
       this.isMovable(tile)
     )(movableTiles)
 
     if (shouldSetNext) {
-      setNext(tile)
+      setNextSnapshot(tile)
     }
   }
 
@@ -72,8 +72,8 @@ class File extends Component {
       selectedFile,
       selectedRank,
       movableTiles,
-      setCapturedNext,
-      setMovable
+      setNextCapturedSnapshot,
+      setNextMovableAxis
     } = this.props
 
     const isMovable = this.isMovable(tile, movableTiles)
@@ -86,8 +86,8 @@ class File extends Component {
       selectedRank,
       tile,
       isMovable,
-      setCapturedNext,
-      setMovable
+      setNextCapturedSnapshot,
+      setNextMovableAxis
     }
 
     const blankProps = {

diff --git a/src/components/Rank/index.js b/src/components/Rank/index.js
@@ -18,9 +18,9 @@ const Rank = (props) => {
     selectedFile,
     selectedRank,
     movableTiles,
-    setCapturedNext,
-    setMovable,
-    setNext
+    setNextCapturedSnapshot,
+    setNextMovableAxis,
+    setNextSnapshot
   } = props
   const cls = cx(css.rank, 'l-flex-row')
   const parseCodeByTile = findCodeByTile(snapshot)
@@ -42,9 +42,9 @@ const Rank = (props) => {
             selectedFile={selectedFile}
             selectedRank={selectedRank}
             movableTiles={movableTiles}
-            setCapturedNext={setCapturedNext}
-            setMovable={setMovable}
-            setNext={setNext}
+            setNextCapturedSnapshot={setNextCapturedSnapshot}
+            setNextMovableAxis={setNextMovableAxis}
+            setNextSnapshot={setNextSnapshot}
           >
             {getPiece(side, piece)}
           </File>
@@ -64,16 +64,16 @@ Rank.propTypes = {
   selectedFile: PropTypes.string,
   selectedRank: PropTypes.string,
   movableTiles: PropTypes.array,
-  setCapturedNext: PropTypes.func,
-  setMovable: PropTypes.func,
-  setNext: PropTypes.func
+  setNextCapturedSnapshot: PropTypes.func,
+  setNextMovableAxis: PropTypes.func,
+  setNextSnapshot: PropTypes.func
 }
 
 Rank.defaultProps = {
   setSelected: noop,
-  setCapturedNext: noop,
-  setMovable: noop,
-  setNext: noop
+  setNextCapturedSnapshot: noop,
+  setNextMovableAxis: noop,
+  setNextSnapshot: noop
 }
 
 export default Rank